Просмотр исходного кода

Standardize & simplify tags panel inclusion

jeremystretch 4 лет назад
Родитель
Сommit
6f05f17c62
51 измененных файлов с 60 добавлено и 42 удалено
  1. 1 1
      netbox/templates/circuits/circuit.html
  2. 1 0
      netbox/templates/circuits/circuittype.html
  3. 1 1
      netbox/templates/circuits/provider.html
  4. 1 1
      netbox/templates/circuits/providernetwork.html
  5. 1 1
      netbox/templates/dcim/cable.html
  6. 1 1
      netbox/templates/dcim/consoleport.html
  7. 1 1
      netbox/templates/dcim/consoleserverport.html
  8. 1 1
      netbox/templates/dcim/device.html
  9. 1 1
      netbox/templates/dcim/devicebay.html
  10. 1 0
      netbox/templates/dcim/devicerole.html
  11. 1 1
      netbox/templates/dcim/devicetype.html
  12. 1 1
      netbox/templates/dcim/frontport.html
  13. 1 1
      netbox/templates/dcim/interface.html
  14. 1 1
      netbox/templates/dcim/inventoryitem.html
  15. 1 0
      netbox/templates/dcim/location.html
  16. 1 0
      netbox/templates/dcim/manufacturer.html
  17. 1 0
      netbox/templates/dcim/platform.html
  18. 1 1
      netbox/templates/dcim/powerfeed.html
  19. 1 1
      netbox/templates/dcim/poweroutlet.html
  20. 1 1
      netbox/templates/dcim/powerpanel.html
  21. 1 1
      netbox/templates/dcim/powerport.html
  22. 1 1
      netbox/templates/dcim/rack.html
  23. 1 1
      netbox/templates/dcim/rackreservation.html
  24. 1 0
      netbox/templates/dcim/rackrole.html
  25. 1 1
      netbox/templates/dcim/rearport.html
  26. 1 0
      netbox/templates/dcim/region.html
  27. 1 2
      netbox/templates/dcim/site.html
  28. 1 0
      netbox/templates/dcim/sitegroup.html
  29. 1 1
      netbox/templates/dcim/virtualchassis.html
  30. 9 6
      netbox/templates/inc/panels/tags.html
  31. 1 1
      netbox/templates/ipam/aggregate.html
  32. 1 1
      netbox/templates/ipam/ipaddress.html
  33. 1 1
      netbox/templates/ipam/iprange.html
  34. 1 1
      netbox/templates/ipam/prefix.html
  35. 1 0
      netbox/templates/ipam/rir.html
  36. 1 0
      netbox/templates/ipam/role.html
  37. 1 1
      netbox/templates/ipam/routetarget.html
  38. 1 1
      netbox/templates/ipam/service.html
  39. 1 1
      netbox/templates/ipam/vlan.html
  40. 1 0
      netbox/templates/ipam/vlangroup.html
  41. 1 1
      netbox/templates/ipam/vrf.html
  42. 1 1
      netbox/templates/tenancy/contact.html
  43. 1 0
      netbox/templates/tenancy/contactgroup.html
  44. 1 0
      netbox/templates/tenancy/contactrole.html
  45. 1 1
      netbox/templates/tenancy/tenant.html
  46. 1 0
      netbox/templates/tenancy/tenantgroup.html
  47. 1 1
      netbox/templates/virtualization/cluster.html
  48. 1 0
      netbox/templates/virtualization/clustergroup.html
  49. 1 0
      netbox/templates/virtualization/clustertype.html
  50. 1 1
      netbox/templates/virtualization/virtualmachine.html
  51. 2 2
      netbox/templates/virtualization/vminterface.html

+ 1 - 1
netbox/templates/circuits/circuit.html

@@ -65,7 +65,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:circuit_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% plugin_left_page object %}
 	</div>

+ 1 - 0
netbox/templates/circuits/circuittype.html

@@ -28,6 +28,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/circuits/provider.html

@@ -47,7 +47,7 @@
                 </table>
             </div>
         </div>
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:provider_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">

+ 1 - 1
netbox/templates/circuits/providernetwork.html

@@ -38,7 +38,7 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:providernetwork_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% plugin_right_page object %}
     </div>

+ 1 - 1
netbox/templates/dcim/cable.html

@@ -64,7 +64,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:cable_list' %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/consoleport.html

@@ -41,7 +41,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/consoleserverport.html

@@ -41,7 +41,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/device.html

@@ -221,7 +221,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:device_list' %}
+            {% include 'inc/panels/tags.html' %}
             {% include 'inc/panels/comments.html' %}
             {% plugin_left_page object %}
         </div>

+ 1 - 1
netbox/templates/dcim/devicebay.html

@@ -33,7 +33,7 @@
                 </div>
             </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 0
netbox/templates/dcim/devicerole.html

@@ -58,6 +58,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/devicetype.html

@@ -88,7 +88,7 @@
         </div>
         <div class="col col-md-6">
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:devicetype_list' %}
+            {% include 'inc/panels/tags.html' %}
             {% include 'inc/panels/comments.html' %}
             {% plugin_right_page object %}
         </div>

+ 1 - 1
netbox/templates/dcim/frontport.html

@@ -53,7 +53,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/interface.html

@@ -103,7 +103,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/inventoryitem.html

@@ -65,7 +65,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 0
netbox/templates/dcim/location.html

@@ -68,6 +68,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">

+ 1 - 0
netbox/templates/dcim/manufacturer.html

@@ -34,6 +34,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 0
netbox/templates/dcim/platform.html

@@ -55,6 +55,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/powerfeed.html

@@ -108,7 +108,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:powerfeed_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/poweroutlet.html

@@ -45,7 +45,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/powerpanel.html

@@ -39,7 +39,7 @@
                 </table>
             </div>
         </div>
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:powerpanel_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
     </div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/powerport.html

@@ -45,7 +45,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/rack.html

@@ -163,7 +163,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:rack_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% if power_feeds %}
             <div class="card">

+ 1 - 1
netbox/templates/dcim/rackreservation.html

@@ -84,7 +84,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:rackreservation_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
 	</div>
     <div class="col col-12 col-xl-7">

+ 1 - 0
netbox/templates/dcim/rackrole.html

@@ -34,6 +34,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/dcim/rearport.html

@@ -47,7 +47,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">

+ 1 - 0
netbox/templates/dcim/region.html

@@ -45,6 +45,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% include 'inc/panels/custom_fields.html' %}
     {% include 'inc/panels/contacts.html' %}
     {% plugin_left_page object %}

+ 1 - 2
netbox/templates/dcim/site.html

@@ -169,7 +169,6 @@
                         <div class="float-end text-warning">
                           <i class="mdi mdi-alert" title="{{ deprecation_warning }}"></i>
                         </div>
-                        <a href="tel:{{ object.contact_
                         <a href="mailto:{{ object.contact_email }}">{{ object.contact_email }}</a>
                       {% else %}
                         <span class="text-muted">&mdash;</span>
@@ -181,7 +180,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:site_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% plugin_left_page object %}
     </div>

+ 1 - 0
netbox/templates/dcim/sitegroup.html

@@ -45,6 +45,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% include 'inc/panels/custom_fields.html' %}
     {% include 'inc/panels/contacts.html' %}
     {% plugin_left_page object %}

+ 1 - 1
netbox/templates/dcim/virtualchassis.html

@@ -39,7 +39,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:virtualchassis_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-8">

+ 9 - 6
netbox/templates/inc/panels/tags.html

@@ -1,11 +1,14 @@
 {% load helpers %}
+
 <div class="card">
-  <h5 class="card-header">
-    Tags
-  </h5>
+  <h5 class="card-header">Tags</h5>
   <div class="card-body">
-    {% for tag in tags.all %} {% tag tag url %} {% empty %}
-    <span class="text-muted">No tags assigned</span>
-    {% endfor %}
+    {% with url=object|validated_viewname:"list" %}
+      {% for tag in object.tags.all %}
+        {% tag tag url %}
+      {% empty %}
+        <span class="text-muted">No tags assigned</span>
+      {% endfor %}
+    {% endwith %}
   </div>
 </div>

+ 1 - 1
netbox/templates/ipam/aggregate.html

@@ -65,7 +65,7 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:aggregate_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_right_page object %}
     </div>
 </div>

+ 1 - 1
netbox/templates/ipam/ipaddress.html

@@ -145,7 +145,7 @@
 
 <div class="row my-3">
     <div class="col col-md-4">
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:ipaddress_list' %}
+        {% include 'inc/panels/tags.html' %}
     </div>
     
 </div>

+ 1 - 1
netbox/templates/ipam/iprange.html

@@ -82,7 +82,7 @@
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:prefix_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/custom_fields.html' %}
         {% plugin_right_page object %}
     </div>

+ 1 - 1
netbox/templates/ipam/prefix.html

@@ -122,7 +122,7 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:prefix_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_right_page object %}
     </div>
 </div>

+ 1 - 0
netbox/templates/ipam/rir.html

@@ -38,6 +38,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 0
netbox/templates/ipam/role.html

@@ -32,6 +32,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/ipam/routetarget.html

@@ -30,7 +30,7 @@
           </table>
         </div>
       </div>
-      {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:routetarget_list' %}
+      {% include 'inc/panels/tags.html' %}
       {% include 'inc/panels/custom_fields.html' %}
       {% plugin_left_page object %}
     </div>

+ 1 - 1
netbox/templates/ipam/service.html

@@ -61,7 +61,7 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:service_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_right_page object %}
     </div>
 </div>

+ 1 - 1
netbox/templates/ipam/vlan.html

@@ -83,7 +83,7 @@
         </div>
         <div class="col col-md-6">
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:vlan_list' %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_right_page object %}
         </div>
     </div>

+ 1 - 0
netbox/templates/ipam/vlangroup.html

@@ -54,6 +54,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/ipam/vrf.html

@@ -60,7 +60,7 @@
       {% plugin_left_page object %}
   </div>
   <div class="col col-md-6">
-    {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:vrf_list' %}
+    {% include 'inc/panels/tags.html' %}
     {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
 	</div>

+ 1 - 1
netbox/templates/tenancy/contact.html

@@ -60,7 +60,7 @@
     </div>
     <div class="col col-md-5">
       {% include 'inc/panels/custom_fields.html' %}
-      {% include 'inc/panels/tags.html' with tags=object.tags.all url='tenancy:tenant_list' %}
+      {% include 'inc/panels/tags.html' %}
       {% plugin_right_page object %}
     </div>
   </div>

+ 1 - 0
netbox/templates/tenancy/contactgroup.html

@@ -45,6 +45,7 @@
           </table>
         </div>
       </div>
+      {% include 'inc/panels/tags.html' %}
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">

+ 1 - 0
netbox/templates/tenancy/contactrole.html

@@ -30,6 +30,7 @@
           </table>
         </div>
       </div>
+      {% include 'inc/panels/tags.html' %}
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">

+ 1 - 1
netbox/templates/tenancy/tenant.html

@@ -36,7 +36,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='tenancy:tenant_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% include 'inc/panels/contacts.html' %}
         {% plugin_left_page object %}

+ 1 - 0
netbox/templates/tenancy/tenantgroup.html

@@ -45,6 +45,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/virtualization/cluster.html

@@ -61,7 +61,7 @@
   </div>
   <div class="col col-md-6">
     {% include 'inc/panels/custom_fields.html' %}
-    {% include 'inc/panels/tags.html' with tags=object.tags.all url='virtualization:cluster_list' %}
+    {% include 'inc/panels/tags.html' %}
     {% include 'inc/panels/contacts.html' %}
     {% plugin_right_page object %}
   </div>

+ 1 - 0
netbox/templates/virtualization/clustergroup.html

@@ -28,6 +28,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 0
netbox/templates/virtualization/clustertype.html

@@ -28,6 +28,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">

+ 1 - 1
netbox/templates/virtualization/virtualmachine.html

@@ -90,7 +90,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='virtualization:virtualmachine_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% plugin_left_page object %}
     </div>

+ 2 - 2
netbox/templates/virtualization/vminterface.html

@@ -70,8 +70,8 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all %}
-          {% plugin_right_page object %}
+        {% include 'inc/panels/tags.html' %}
+        {% plugin_right_page object %}
     </div>
 </div>
 <div class="row mb-3">