#7025: Misc cleanup

netbox/circuits/forms/model_forms.py

@@ -198,6 +198,7 @@ class CircuitGroupAssignmentForm(NetBoxModelForm):
     circuit = DynamicModelChoiceField(
         label=_('Circuit'),
         queryset=Circuit.objects.all(),
+        selector=True
     )
 
     class Meta:

netbox/circuits/migrations/0044_circuitgroup_circuitgroupassignment_and_more.py → netbox/circuits/migrations/0044_circuit_groups.py

@@ -78,7 +78,7 @@ class Migration(migrations.Migration):
             options={
                 'verbose_name': 'Circuit group assignment',
                 'verbose_name_plural': 'Circuit group assignments',
-                'ordering': ('circuit', 'priority', 'pk'),
+                'ordering': ('group', 'circuit', 'priority', 'pk'),
             },
         ),
         migrations.AddConstraint(

netbox/circuits/models/circuits.py

@@ -203,7 +203,7 @@ class CircuitGroupAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin,
     )
 
     class Meta:
-        ordering = ('circuit', 'priority', 'pk')
+        ordering = ('group', 'circuit', 'priority', 'pk')
         constraints = (
             models.UniqueConstraint(
                 fields=('circuit', 'group'),

netbox/circuits/tables/circuits.py

@@ -77,18 +77,22 @@ class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
         verbose_name=_('Commit Rate')
     )
     comments = columns.MarkdownColumn(
-        verbose_name=_('Comments'),
+        verbose_name=_('Comments')
     )
     tags = columns.TagColumn(
         url_name='circuits:circuit_list'
     )
+    assignments = columns.ManyToManyColumn(
+        verbose_name=_('Assignments'),
+        linkify_item=True
+    )
 
     class Meta(NetBoxTable.Meta):
         model = Circuit
         fields = (
             'pk', 'id', 'cid', 'provider', 'provider_account', 'type', 'status', 'tenant', 'tenant_group',
             'termination_a', 'termination_z', 'install_date', 'termination_date', 'commit_rate', 'description',
-            'comments', 'contacts', 'tags', 'created', 'last_updated',
+            'comments', 'contacts', 'tags', 'created', 'last_updated', 'assignments',
         )
         default_columns = (
             'pk', 'cid', 'provider', 'type', 'status', 'tenant', 'termination_a', 'termination_z', 'description',

netbox/templates/circuits/circuitgroupassignment.html

@@ -20,23 +20,23 @@
         <table class="table table-hover attr-table">
           <tr>
             <th scope="row">{% trans "Group" %}</th>
-            <td>{{ object.group }}</td>
+            <td>{{ object.group|linkify }}</td>
           </tr>
           <tr>
             <th scope="row">{% trans "Circuit" %}</th>
-            <td>{{ object.circuit }}</td>
+            <td>{{ object.circuit|linkify }}</td>
           </tr>
           <tr>
             <th scope="row">{% trans "Priority" %}</th>
-            <td>{{ object.priority }}</td>
+            <td>{{ object.get_priority_display }}</td>
           </tr>
         </table>
       </div>
       {% include 'inc/panels/tags.html' %}
-      {% include 'inc/panels/custom_fields.html' %}
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
+      {% include 'inc/panels/custom_fields.html' %}
       {% plugin_right_page object %}
     </div>
   </div>