2
0
Arthur 1 долоо хоног өмнө
parent
commit
be32bc8a74

+ 1 - 1
netbox/dcim/api/views.py

@@ -516,7 +516,7 @@ class RearPortViewSet(PassThroughPortMixin, NetBoxModelViewSet):
 
 
 
 
 class ModuleBayViewSet(NetBoxModelViewSet):
 class ModuleBayViewSet(NetBoxModelViewSet):
-    queryset = ModuleBay.objects.all()
+    queryset = ModuleBay.objects.order_by('device', 'module', 'name')
     serializer_class = serializers.ModuleBaySerializer
     serializer_class = serializers.ModuleBaySerializer
     filterset_class = filtersets.ModuleBayFilterSet
     filterset_class = filtersets.ModuleBayFilterSet
 
 

+ 1 - 1
netbox/dcim/forms/model_forms.py

@@ -746,7 +746,7 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
         queryset=ModuleBay.objects.all(),
         queryset=ModuleBay.objects.all(),
         query_params={
         query_params={
             'device_id': '$device',
             'device_id': '$device',
-            'ordering': 'name',
+            'ordering': 'module,name',
         },
         },
         context={
         context={
             'disabled': 'installed_module',
             'disabled': 'installed_module',