From 94316e81cca3f7a3463c28efa715b4634447014c Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Mon, 29 Jul 2024 16:59:40 +0700 Subject: [PATCH] 10500 don't return reverse / optimize --- netbox/dcim/forms/common.py | 3 ++- netbox/dcim/models/device_component_templates.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/forms/common.py b/netbox/dcim/forms/common.py index aececa200..515ff9b83 100644 --- a/netbox/dcim/forms/common.py +++ b/netbox/dcim/forms/common.py @@ -80,7 +80,8 @@ class ModuleCommonForm(forms.Form): else: module_bay = None - return module_bays.reverse() + module_bays.reverse() + return module_bays def clean(self): super().clean() diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index 1888e00fa..6791e2f1c 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -172,6 +172,9 @@ class ModularComponentTemplateModel(ComponentTemplateModel): return modules def resolve_name(self, module): + if MODULE_TOKEN not in self.name: + return self.name + if module: modules = self._get_module_tree(module) name = self.name @@ -181,6 +184,9 @@ class ModularComponentTemplateModel(ComponentTemplateModel): return self.name def resolve_label(self, module): + if MODULE_TOKEN not in self.label: + return self.label + if module: modules = self._get_module_tree(module) label = self.label