Clean up component template creation for ModuleTypes

netbox/dcim/forms/object_create.py

@@ -8,9 +8,9 @@ from utilities.forms import (
 )
 
 __all__ = (
-    'ComponentTemplateCreateForm',
+    'ModularComponentTemplateCreateForm',
     'DeviceComponentCreateForm',
-    'DeviceTypeComponentCreateForm',
+    'ComponentTemplateCreateForm',
     'FrontPortCreateForm',
     'FrontPortTemplateCreateForm',
     'VirtualChassisCreateForm',
@@ -45,14 +45,20 @@ class ComponentCreateForm(BootstrapMixin, forms.Form):
                 }, code='label_pattern_mismatch')
 
 
-class DeviceTypeComponentCreateForm(ComponentCreateForm):
+class ComponentTemplateCreateForm(ComponentCreateForm):
+    """
+    Creation form for component templates that can be assigned only to a DeviceType.
+    """
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
     )
     field_order = ('device_type', 'name_pattern', 'label_pattern')
 
 
-class ComponentTemplateCreateForm(ComponentCreateForm):
+class ModularComponentTemplateCreateForm(ComponentCreateForm):
+    """
+    Creation form for component templates that can be assigned to either a DeviceType *or* a ModuleType.
+    """
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
         required=False
@@ -71,7 +77,7 @@ class DeviceComponentCreateForm(ComponentCreateForm):
     field_order = ('device', 'name_pattern', 'label_pattern')
 
 
-class FrontPortTemplateCreateForm(DeviceTypeComponentCreateForm):
+class FrontPortTemplateCreateForm(ModularComponentTemplateCreateForm):
     rear_port_set = forms.MultipleChoiceField(
         choices=[],
         label='Rear ports',
@@ -84,19 +90,27 @@ class FrontPortTemplateCreateForm(DeviceTypeComponentCreateForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        device_type = DeviceType.objects.get(
+        # TODO: This needs better validation
-            pk=self.initial.get('device_type') or self.data.get('device_type')
+        if 'device_type' in self.initial or self.data.get('device_type'):
-        )
+            parent = DeviceType.objects.get(
+                pk=self.initial.get('device_type') or self.data.get('device_type')
+            )
+        elif 'module_type' in self.initial or self.data.get('module_type'):
+            parent = ModuleType.objects.get(
+                pk=self.initial.get('module_type') or self.data.get('module_type')
+            )
+        else:
+            return
 
         # Determine which rear port positions are occupied. These will be excluded from the list of available mappings.
         occupied_port_positions = [
             (front_port.rear_port_id, front_port.rear_port_position)
-            for front_port in device_type.frontporttemplates.all()
+            for front_port in parent.frontporttemplates.all()
         ]
 
         # Populate rear port choices
         choices = []
-        rear_ports = RearPortTemplate.objects.filter(device_type=device_type)
+        rear_ports = parent.rearporttemplates.all()
         for rear_port in rear_ports:
             for i in range(1, rear_port.positions + 1):
                 if (rear_port.pk, i) not in occupied_port_positions:

netbox/dcim/views.py

@@ -50,23 +50,26 @@ class DeviceTypeComponentsView(DeviceComponentsView):
         return self.child_model.objects.restrict(request.user, 'view').filter(device_type=parent)
 
     def get_extra_context(self, request, instance):
-        if self.viewname:
+        context = super().get_extra_context(request, instance)
-            return_url = reverse(self.viewname, kwargs={'pk': instance.pk})
+        context['return_url'] = reverse(self.viewname, kwargs={'pk': instance.pk})
-        else:
+
-            return_url = instance.get_absolute_url()
+        return context
-        return {
-            'active_tab': f"{self.child_model._meta.verbose_name_plural.replace(' ', '-')}",
-            'return_url': return_url,
-        }
 
 
 class ModuleTypeComponentsView(DeviceComponentsView):
     queryset = ModuleType.objects.all()
     template_name = 'dcim/moduletype/component_templates.html'
+    viewname = None  # Used for return_url resolution
 
     def get_children(self, request, parent):
         return self.child_model.objects.restrict(request.user, 'view').filter(module_type=parent)
 
+    def get_extra_context(self, request, instance):
+        context = super().get_extra_context(request, instance)
+        context['return_url'] = reverse(self.viewname, kwargs={'pk': instance.pk})
+
+        return context
+
 
 class BulkDisconnectView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
@@ -858,6 +861,7 @@ class DeviceTypeModuleBaysView(DeviceTypeComponentsView):
     child_model = ModuleBayTemplate
     table = tables.ModuleBayTemplateTable
     filterset = filtersets.ModuleBayTemplateFilterSet
+    viewname = 'dcim:devicetype_modulebays'
 
 
 class DeviceTypeDeviceBaysView(DeviceTypeComponentsView):
@@ -962,42 +966,49 @@ class ModuleTypeConsolePortsView(ModuleTypeComponentsView):
     child_model = ConsolePortTemplate
     table = tables.ConsolePortTemplateTable
     filterset = filtersets.ConsolePortTemplateFilterSet
+    viewname = 'dcim:moduletype_consoleports'
 
 
 class ModuleTypeConsoleServerPortsView(ModuleTypeComponentsView):
     child_model = ConsoleServerPortTemplate
     table = tables.ConsoleServerPortTemplateTable
     filterset = filtersets.ConsoleServerPortTemplateFilterSet
+    viewname = 'dcim:moduletype_consoleserverports'
 
 
 class ModuleTypePowerPortsView(ModuleTypeComponentsView):
     child_model = PowerPortTemplate
     table = tables.PowerPortTemplateTable
     filterset = filtersets.PowerPortTemplateFilterSet
+    viewname = 'dcim:moduletype_powerports'
 
 
 class ModuleTypePowerOutletsView(ModuleTypeComponentsView):
     child_model = PowerOutletTemplate
     table = tables.PowerOutletTemplateTable
     filterset = filtersets.PowerOutletTemplateFilterSet
+    viewname = 'dcim:moduletype_poweroutlets'
 
 
 class ModuleTypeInterfacesView(ModuleTypeComponentsView):
     child_model = InterfaceTemplate
     table = tables.InterfaceTemplateTable
     filterset = filtersets.InterfaceTemplateFilterSet
+    viewname = 'dcim:moduletype_interfaces'
 
 
 class ModuleTypeFrontPortsView(ModuleTypeComponentsView):
     child_model = FrontPortTemplate
     table = tables.FrontPortTemplateTable
     filterset = filtersets.FrontPortTemplateFilterSet
+    viewname = 'dcim:moduletype_frontports'
 
 
 class ModuleTypeRearPortsView(ModuleTypeComponentsView):
     child_model = RearPortTemplate
     table = tables.RearPortTemplateTable
     filterset = filtersets.RearPortTemplateFilterSet
+    viewname = 'dcim:moduletype_rearports'
 
 
 class ModuleTypeEditView(generic.ObjectEditView):
@@ -1060,8 +1071,9 @@ class ModuleTypeBulkDeleteView(generic.BulkDeleteView):
 
 class ConsolePortTemplateCreateView(generic.ComponentCreateView):
     queryset = ConsolePortTemplate.objects.all()
-    form = forms.ComponentTemplateCreateForm
+    form = forms.ModularComponentTemplateCreateForm
     model_form = forms.ConsolePortTemplateForm
+    template_name = 'dcim/component_template_create.html'
 
 
 class ConsolePortTemplateEditView(generic.ObjectEditView):
@@ -1094,8 +1106,9 @@ class ConsolePortTemplateBulkDeleteView(generic.BulkDeleteView):
 
 class ConsoleServerPortTemplateCreateView(generic.ComponentCreateView):
     queryset = ConsoleServerPortTemplate.objects.all()
-    form = forms.ComponentTemplateCreateForm
+    form = forms.ModularComponentTemplateCreateForm
     model_form = forms.ConsoleServerPortTemplateForm
+    template_name = 'dcim/component_template_create.html'
 
 
 class ConsoleServerPortTemplateEditView(generic.ObjectEditView):
@@ -1128,8 +1141,9 @@ class ConsoleServerPortTemplateBulkDeleteView(generic.BulkDeleteView):
 
 class PowerPortTemplateCreateView(generic.ComponentCreateView):
     queryset = PowerPortTemplate.objects.all()
-    form = forms.ComponentTemplateCreateForm
+    form = forms.ModularComponentTemplateCreateForm
     model_form = forms.PowerPortTemplateForm
+    template_name = 'dcim/component_template_create.html'
 
 
 class PowerPortTemplateEditView(generic.ObjectEditView):
@@ -1162,8 +1176,9 @@ class PowerPortTemplateBulkDeleteView(generic.BulkDeleteView):
 
 class PowerOutletTemplateCreateView(generic.ComponentCreateView):
     queryset = PowerOutletTemplate.objects.all()
-    form = forms.ComponentTemplateCreateForm
+    form = forms.ModularComponentTemplateCreateForm
     model_form = forms.PowerOutletTemplateForm
+    template_name = 'dcim/component_template_create.html'
 
 
 class PowerOutletTemplateEditView(generic.ObjectEditView):
@@ -1196,8 +1211,9 @@ class PowerOutletTemplateBulkDeleteView(generic.BulkDeleteView):
 
 class InterfaceTemplateCreateView(generic.ComponentCreateView):
     queryset = InterfaceTemplate.objects.all()
-    form = forms.ComponentTemplateCreateForm
+    form = forms.ModularComponentTemplateCreateForm
     model_form = forms.InterfaceTemplateForm
+    template_name = 'dcim/component_template_create.html'
 
 
 class InterfaceTemplateEditView(generic.ObjectEditView):
@@ -1232,6 +1248,7 @@ class FrontPortTemplateCreateView(generic.ComponentCreateView):
     queryset = FrontPortTemplate.objects.all()
     form = forms.FrontPortTemplateCreateForm
     model_form = forms.FrontPortTemplateForm
+    template_name = 'dcim/frontporttemplate_create.html'
 
     def initialize_forms(self, request):
         form, model_form = super().initialize_forms(request)
@@ -1272,8 +1289,9 @@ class FrontPortTemplateBulkDeleteView(generic.BulkDeleteView):
 
 class RearPortTemplateCreateView(generic.ComponentCreateView):
     queryset = RearPortTemplate.objects.all()
-    form = forms.ComponentTemplateCreateForm
+    form = forms.ModularComponentTemplateCreateForm
     model_form = forms.RearPortTemplateForm
+    template_name = 'dcim/component_template_create.html'
 
 
 class RearPortTemplateEditView(generic.ObjectEditView):
@@ -1306,8 +1324,9 @@ class RearPortTemplateBulkDeleteView(generic.BulkDeleteView):
 
 class ModuleBayTemplateCreateView(generic.ComponentCreateView):
     queryset = ModuleBayTemplate.objects.all()
-    form = forms.DeviceTypeComponentCreateForm
+    form = forms.ComponentTemplateCreateForm
     model_form = forms.ModuleBayTemplateForm
+    template_name = 'dcim/component_template_create.html'
 
 
 class ModuleBayTemplateEditView(generic.ObjectEditView):
@@ -1340,8 +1359,9 @@ class ModuleBayTemplateBulkDeleteView(generic.BulkDeleteView):
 
 class DeviceBayTemplateCreateView(generic.ComponentCreateView):
     queryset = DeviceBayTemplate.objects.all()
-    form = forms.DeviceTypeComponentCreateForm
+    form = forms.ComponentTemplateCreateForm
     model_form = forms.DeviceBayTemplateForm
+    template_name = 'dcim/component_template_create.html'
 
 
 class DeviceBayTemplateEditView(generic.ObjectEditView):
@@ -1374,7 +1394,7 @@ class DeviceBayTemplateBulkDeleteView(generic.BulkDeleteView):
 
 class InventoryItemTemplateCreateView(generic.ComponentCreateView):
     queryset = InventoryItemTemplate.objects.all()
-    form = forms.ComponentTemplateCreateForm
+    form = forms.ModularComponentTemplateCreateForm
     model_form = forms.InventoryItemTemplateForm
     template_name = 'dcim/inventoryitem_create.html'
 

netbox/templates/dcim/component_template_create.html

@@ -0,0 +1,34 @@
+{% extends 'generic/object_edit.html' %}
+{% load form_helpers %}
+
+{% block form %}
+  <div class="row mb-2">
+    <div class="offset-sm-3">
+      <ul class="nav nav-pills" role="tablist">
+        <li role="presentation" class="nav-item">
+          <button role="tab" type="button" id="devicetype_tab" data-bs-toggle="tab" aria-controls="devicetype" data-bs-target="#devicetype" class="nav-link {% if not form.initial.module_type %}active{% endif %}">
+            Device Type
+          </button>
+        </li>
+        <li role="presentation" class="nav-item">
+          <button role="tab" type="button" id="moduletype_tab" data-bs-toggle="tab" aria-controls="moduletype" data-bs-target="#moduletype" class="nav-link {% if form.initial.module_type %}active{% endif %}">
+            Module Type
+          </button>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="tab-content p-0 border-0">
+    <div class="tab-pane {% if not form.initial.module_type %}active{% endif %}" id="devicetype" role="tabpanel">
+      {% render_field replication_form.device_type %}
+    </div>
+    <div class="tab-pane {% if form.initial.module_type %}active{% endif %}" id="moduletype" role="tabpanel">
+      {% render_field replication_form.module_type %}
+    </div>
+    {% block replication_fields %}
+      {% render_field replication_form.name_pattern %}
+      {% render_field replication_form.label_pattern %}
+    {% endblock replication_fields %}
+  </div>
+  {{ block.super }}
+{% endblock form %}

netbox/templates/dcim/frontporttemplate_create.html

@@ -0,0 +1,7 @@
+{% extends 'dcim/component_template_create.html' %}
+{% load form_helpers %}
+
+{% block replication_fields %}
+  {{ block.super }}
+  {% render_field replication_form.rear_port_set %}
+{% endblock replication_fields %}

netbox/templates/dcim/inventoryitem_create.html

@@ -1,9 +1,9 @@
-{% extends 'generic/object_edit.html' %}
+{% extends 'dcim/component_template_create.html' %}
 {% load helpers %}
 {% load form_helpers %}
 
-{% block form %}
+{% block replication_fields %}
-  {% render_form replication_form %}
+  {{ block.super }}
   {% if object.component %}
     <div class="row mb-3">
         <label class="col-sm-3 col-form-label text-lg-end">
@@ -14,5 +14,4 @@
         </div>
     </div>
   {% endif %}
-  {{ block.super }}
+{% endblock replication_fields %}
-{% endblock %}