NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 08:38:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

10500 don't return reverse / optimize

Browse Source
This commit is contained in:
Arthur Hanson 2024-07-29 16:59:40 +07:00
parent acfbae3d1c
commit 94316e81cc
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/dcim/forms/common.py
View File

@ -80,7 +80,8 @@ class ModuleCommonForm(forms.Form):
else: else:
module_bay = None module_bay = None
return module_bays.reverse() module_bays.reverse()
return module_bays
def clean(self): def clean(self):
super().clean() super().clean()

6
netbox/dcim/models/device_component_templates.py
View File

@ -172,6 +172,9 @@ class ModularComponentTemplateModel(ComponentTemplateModel):
return modules return modules
def resolve_name(self, module): def resolve_name(self, module):
if MODULE_TOKEN not in self.name:
return self.name
if module: if module:
modules = self._get_module_tree(module) modules = self._get_module_tree(module)
name = self.name name = self.name
@ -181,6 +184,9 @@ class ModularComponentTemplateModel(ComponentTemplateModel):
return self.name return self.name
def resolve_label(self, module): def resolve_label(self, module):
if MODULE_TOKEN not in self.label:
return self.label
if module: if module:
modules = self._get_module_tree(module) modules = self._get_module_tree(module)
label = self.label label = self.label