Misc cleanup & reordering of form fields

2025-08-08 00:28:16 -06:00 · 2024-07-25 14:49:48 -04:00 · 2024-07-25 14:49:48 -04:00 · a2eba9df93
commit a2eba9df93
parent 660344b16b
8 changed files with 50 additions and 42 deletions
--- a/netbox/dcim/api/serializers_/devices.py
+++ b/netbox/dcim/api/serializers_/devices.py
@ -149,7 +149,7 @@ class ModuleSerializer(NetBoxModelSerializer):
    class Meta:
        model = Module
        fields = [
-            'id', 'url', 'display_url', 'display', 'device', 'module_bay', 'module_type', 'status',
-            'serial', 'asset_tag', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'id', 'url', 'display_url', 'display', 'device', 'module_bay', 'module_type', 'status', 'serial',
+            'asset_tag', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'device', 'module_bay', 'module_type', 'description')
--- a/netbox/dcim/api/serializers_/devicetypes.py
+++ b/netbox/dcim/api/serializers_/devicetypes.py
@ -62,9 +62,21 @@ class DeviceTypeSerializer(NetBoxModelSerializer):


 class ModuleTypeSerializer(NetBoxModelSerializer):
-    manufacturer = ManufacturerSerializer(nested=True)
-    weight_unit = ChoiceField(choices=WeightUnitChoices, allow_blank=True, required=False, allow_null=True)
-    airflow = ChoiceField(choices=ModuleAirflowChoices, allow_blank=True, required=False, allow_null=True)
+    manufacturer = ManufacturerSerializer(
+        nested=True
+    )
+    weight_unit = ChoiceField(
+        choices=WeightUnitChoices,
+        allow_blank=True,
+        required=False,
+        allow_null=True
+    )
+    airflow = ChoiceField(
+        choices=ModuleAirflowChoices,
+        allow_blank=True,
+        required=False,
+        allow_null=True
+    )

    class Meta:
        model = ModuleType
--- a/netbox/dcim/api/serializers_/racks.py
+++ b/netbox/dcim/api/serializers_/racks.py
@ -75,8 +75,8 @@ class RackTypeSerializer(RackBaseSerializer):
        fields = [
            'id', 'url', 'display_url', 'display', 'manufacturer', 'name', 'slug', 'description', 'form_factor',
            'width', 'u_height', 'starting_unit', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', 'weight',
-            'max_weight', 'weight_unit', 'mounting_depth', 'airflow', 'description', 'comments', 'tags', 'custom_fields',
-            'created', 'last_updated',
+            'max_weight', 'weight_unit', 'mounting_depth', 'airflow', 'description', 'comments', 'tags',
+            'custom_fields', 'created', 'last_updated',
        ]
        brief_fields = ('id', 'url', 'display', 'manufacturer', 'name', 'slug', 'description')

--- a/netbox/dcim/forms/bulk_edit.py
+++ b/netbox/dcim/forms/bulk_edit.py
@ -298,12 +298,10 @@ class RackTypeBulkEditForm(NetBoxModelBulkEditForm):

    model = RackType
    fieldsets = (
-        FieldSet('manufacturer', 'description', 'form_factor', name=_('Rack Type')),
+        FieldSet('manufacturer', 'description', 'form_factor', 'width', 'u_height', 'airflow', name=_('Rack Type')),
        FieldSet(
-            'width',
-            'u_height',
            InlineFields('outer_width', 'outer_depth', 'outer_unit', label=_('Outer Dimensions')),
-            InlineFields('airflow', 'weight', 'max_weight', 'weight_unit', label=_('Chassis')),
+            InlineFields('weight', 'max_weight', 'weight_unit', label=_('Weight')),
            'mounting_depth',
            name=_('Dimensions')
        ),
@ -447,10 +445,10 @@ class RackBulkEditForm(NetBoxModelBulkEditForm):
        FieldSet('status', 'role', 'tenant', 'serial', 'asset_tag', 'description', name=_('Rack')),
        FieldSet('region', 'site_group', 'site', 'location', name=_('Location')),
        FieldSet(
-            'form_factor', 'width', 'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit',
+            'form_factor', 'width', 'u_height', 'desc_units', 'airflow', 'outer_width', 'outer_depth', 'outer_unit',
            'mounting_depth', name=_('Hardware')
        ),
-        FieldSet('airflow', 'weight', 'max_weight', 'weight_unit', name=_('Chassis')),
+        FieldSet('weight', 'max_weight', 'weight_unit', name=_('Weight')),
    )
    nullable_fields = (
        'location', 'tenant', 'role', 'serial', 'asset_tag', 'outer_width', 'outer_depth', 'outer_unit', 'weight',
@ -599,7 +597,11 @@ class ModuleTypeBulkEditForm(NetBoxModelBulkEditForm):
    model = ModuleType
    fieldsets = (
        FieldSet('manufacturer', 'part_number', 'description', name=_('Module Type')),
-        FieldSet('airflow', 'weight', 'weight_unit', name=_('Chassis')),
+        FieldSet(
+            'airflow',
+            InlineFields('weight', 'max_weight', 'weight_unit', label=_('Weight')),
+            name=_('Chassis')
+        ),
    )
    nullable_fields = ('part_number', 'weight', 'weight_unit', 'description', 'comments')

--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@ -211,11 +211,11 @@ class RackTypeForm(NetBoxModelForm):
    slug = SlugField()

    fieldsets = (
-        FieldSet('manufacturer', 'name', 'slug', 'description', 'form_factor', 'tags', name=_('Rack Type')),
+        FieldSet('manufacturer', 'name', 'slug', 'description', 'form_factor', 'airflow', 'tags', name=_('Rack Type')),
        FieldSet(
            'width', 'u_height',
            InlineFields('outer_width', 'outer_depth', 'outer_unit', label=_('Outer Dimensions')),
-            InlineFields('airflow', 'weight', 'max_weight', 'weight_unit', label=_('Chassis')),
+            InlineFields('weight', 'max_weight', 'weight_unit', label=_('Weight')),
            'mounting_depth', name=_('Dimensions')
        ),
        FieldSet('starting_unit', 'desc_units', name=_('Numbering')),
@ -290,9 +290,9 @@ class RackForm(TenancyForm, NetBoxModelForm):
            self.fieldsets = (
                *self.fieldsets,
                FieldSet(
-                    'form_factor', 'width', 'starting_unit', 'u_height',
+                    'form_factor', 'width', 'starting_unit', 'u_height', 'airflow',
                    InlineFields('outer_width', 'outer_depth', 'outer_unit', label=_('Outer Dimensions')),
-                    InlineFields('airflow', 'weight', 'max_weight', 'weight_unit', label=_('Chassis')),
+                    InlineFields('weight', 'max_weight', 'weight_unit', label=_('Weight')),
                    'mounting_depth', 'desc_units', name=_('Dimensions')
                ),
            )
--- a/netbox/dcim/models/racks.py
+++ b/netbox/dcim/models/racks.py
@ -53,6 +53,12 @@ class RackBase(WeightMixin, PrimaryModel):
        verbose_name=_('width'),
        help_text=_('Rail-to-rail width')
    )
+    airflow = models.CharField(
+        verbose_name=_('airflow'),
+        max_length=50,
+        choices=RackAirflowChoices,
+        blank=True
+    )

    # Numbering
    u_height = models.PositiveSmallIntegerField(
@ -116,14 +122,6 @@ class RackBase(WeightMixin, PrimaryModel):
        null=True
    )

-    # Airflow
-    airflow = models.CharField(
-        verbose_name=_('airflow'),
-        max_length=50,
-        choices=RackAirflowChoices,
-        blank=True
-    )
-
    class Meta:
        abstract = True

@ -240,10 +238,10 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase):
    Each Rack is assigned to a Site and (optionally) a Location.
    """
    # Fields which cannot be set locally if a RackType is assigned
-    RACKTYPE_FIELDS = [
-        'form_factor', 'width', 'u_height', 'starting_unit', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit',
-        'mounting_depth', 'weight', 'weight_unit', 'max_weight', 'airflow'
-    ]
+    RACKTYPE_FIELDS = (
+        'form_factor', 'width', 'airflow', 'u_height', 'starting_unit', 'desc_units', 'outer_width', 'outer_depth',
+        'outer_unit', 'mounting_depth', 'weight', 'weight_unit', 'max_weight',
+    )

    rack_type = models.ForeignKey(
        to='dcim.RackType',
@ -324,8 +322,8 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase):
    )

    clone_fields = (
-        'site', 'location', 'tenant', 'status', 'role', 'form_factor', 'width', 'u_height', 'desc_units', 'outer_width',
-        'outer_depth', 'outer_unit', 'mounting_depth', 'weight', 'max_weight', 'weight_unit', 'airflow',
+        'site', 'location', 'tenant', 'status', 'role', 'form_factor', 'width', 'airflow', 'u_height', 'desc_units',
+        'outer_width', 'outer_depth', 'outer_unit', 'mounting_depth', 'weight', 'max_weight', 'weight_unit',
    )
    prerequisite_models = (
        'dcim.Site',
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@ -61,6 +61,10 @@
            <th scope="row">{% trans "Asset Tag" %}</th>
            <td class="font-monospace">{{ object.asset_tag|placeholder }}</td>
          </tr>
+          <tr>
+            <th scope="row">{% trans "Airflow" %}</th>
+            <td>{{ object.get_airflow_display|placeholder }}</td>
+          </tr>
          <tr>
            <th scope="row">{% trans "Space Utilization" %}</th>
            <td>{% utilization_graph object.get_utilization %}</td>
@ -69,12 +73,6 @@
            <th scope="row">{% trans "Power Utilization" %}</th>
            <td>{% utilization_graph object.get_power_utilization %}</td>
          </tr>
-          <tr>
-              <th scope="row">{% trans "Airflow" %}</th>
-              <td>
-                  {{ object.get_airflow_display|placeholder }}
-              </td>
-          </tr>
        </table>
      </div>
      {% include 'dcim/inc/panels/racktype_dimensions.html' %}
--- a/netbox/templates/dcim/racktype.html
+++ b/netbox/templates/dcim/racktype.html
@ -25,10 +25,8 @@
            <td>{{ object.description|placeholder }}</td>
          </tr>
          <tr>
-              <th scope="row">{% trans "Airflow" %}</th>
-              <td>
-                  {{ object.get_airflow_display|placeholder }}
-              </td>
+            <th scope="row">{% trans "Airflow" %}</th>
+            <td>{{ object.get_airflow_display|placeholder }}</td>
          </tr>
        </table>
      </div>