Browse Source

Closes #10202: Clean up TemplateColumn template code & accessors

jeremystretch 3 years ago
parent
commit
14f79ef85a

+ 1 - 1
netbox/dcim/tables/racks.py

@@ -51,7 +51,7 @@ class RackTable(TenancyColumnsMixin, NetBoxTable):
     status = columns.ChoiceFieldColumn()
     status = columns.ChoiceFieldColumn()
     role = columns.ColoredLabelColumn()
     role = columns.ColoredLabelColumn()
     u_height = tables.TemplateColumn(
     u_height = tables.TemplateColumn(
-        template_code="{{ record.u_height }}U",
+        template_code="{{ value }}U",
         verbose_name='Height'
         verbose_name='Height'
     )
     )
     comments = columns.MarkdownColumn()
     comments = columns.MarkdownColumn()

+ 3 - 3
netbox/dcim/tables/template_code.py

@@ -33,7 +33,7 @@ DEVICEBAY_STATUS = """
 
 
 INTERFACE_IPADDRESSES = """
 INTERFACE_IPADDRESSES = """
 <div class="table-badge-group">
 <div class="table-badge-group">
-  {% for ip in record.ip_addresses.all %}
+  {% for ip in value.all %}
     {% if ip.status != 'active' %}
     {% if ip.status != 'active' %}
       <a href="{{ ip.get_absolute_url }}" class="table-badge badge bg-{{ ip.get_status_color }}" data-bs-toggle="tooltip" data-bs-placement="left" title="{{ ip.get_status_display }}">{{ ip }}</a>
       <a href="{{ ip.get_absolute_url }}" class="table-badge badge bg-{{ ip.get_status_color }}" data-bs-toggle="tooltip" data-bs-placement="left" title="{{ ip.get_status_display }}">{{ ip }}</a>
     {% else %}
     {% else %}
@@ -53,7 +53,7 @@ INTERFACE_FHRPGROUPS = """
 
 
 INTERFACE_TAGGED_VLANS = """
 INTERFACE_TAGGED_VLANS = """
 {% if record.mode == 'tagged' %}
 {% if record.mode == 'tagged' %}
-    {% for vlan in record.tagged_vlans.all %}
+    {% for vlan in value.all %}
         <a href="{{ vlan.get_absolute_url }}">{{ vlan }}</a><br />
         <a href="{{ vlan.get_absolute_url }}">{{ vlan }}</a><br />
     {% endfor %}
     {% endfor %}
 {% elif record.mode == 'tagged-all' %}
 {% elif record.mode == 'tagged-all' %}
@@ -62,7 +62,7 @@ INTERFACE_TAGGED_VLANS = """
 """
 """
 
 
 INTERFACE_WIRELESS_LANS = """
 INTERFACE_WIRELESS_LANS = """
-{% for wlan in record.wireless_lans.all %}
+{% for wlan in value.all %}
   <a href="{{ wlan.get_absolute_url }}">{{ wlan }}</a><br />
   <a href="{{ wlan.get_absolute_url }}">{{ wlan }}</a><br />
 {% endfor %}
 {% endfor %}
 """
 """

+ 1 - 1
netbox/extras/tables/template_code.py

@@ -9,7 +9,7 @@ CONFIGCONTEXT_ACTIONS = """
 
 
 OBJECTCHANGE_FULL_NAME = """
 OBJECTCHANGE_FULL_NAME = """
 {% load helpers %}
 {% load helpers %}
-{{ record.user.get_full_name|placeholder }}
+{{ value.get_full_name|placeholder }}
 """
 """
 
 
 OBJECTCHANGE_OBJECT = """
 OBJECTCHANGE_OBJECT = """

+ 1 - 1
netbox/ipam/tables/fhrp.py

@@ -10,7 +10,7 @@ __all__ = (
 
 
 
 
 IPADDRESSES = """
 IPADDRESSES = """
-{% for ip in record.ip_addresses.all %}
+{% for ip in value.all %}
   <a href="{{ ip.get_absolute_url }}">{{ ip }}</a><br />
   <a href="{{ ip.get_absolute_url }}">{{ ip }}</a><br />
 {% endfor %}
 {% endfor %}
 """
 """

+ 1 - 1
netbox/ipam/tables/ip.py

@@ -47,7 +47,7 @@ IPADDRESS_ASSIGN_LINK = """
 """
 """
 
 
 VRF_LINK = """
 VRF_LINK = """
-{% if record.vrf %}
+{% if value %}
     <a href="{{ record.vrf.get_absolute_url }}">{{ record.vrf }}</a>
     <a href="{{ record.vrf.get_absolute_url }}">{{ record.vrf }}</a>
 {% elif object.vrf %}
 {% elif object.vrf %}
     <a href="{{ object.vrf.get_absolute_url }}">{{ object.vrf }}</a>
     <a href="{{ object.vrf.get_absolute_url }}">{{ object.vrf }}</a>

+ 1 - 1
netbox/ipam/tables/vlans.py

@@ -30,7 +30,7 @@ VLAN_LINK = """
 """
 """
 
 
 VLAN_PREFIXES = """
 VLAN_PREFIXES = """
-{% for prefix in record.prefixes.all %}
+{% for prefix in value.all %}
     <a href="{% url 'ipam:prefix' pk=prefix.pk %}">{{ prefix }}</a>{% if not forloop.last %}<br />{% endif %}
     <a href="{% url 'ipam:prefix' pk=prefix.pk %}">{{ prefix }}</a>{% if not forloop.last %}<br />{% endif %}
 {% endfor %}
 {% endfor %}
 """
 """

+ 1 - 1
netbox/virtualization/tables/virtualmachines.py

@@ -12,7 +12,7 @@ __all__ = (
 )
 )
 
 
 VMINTERFACE_BUTTONS = """
 VMINTERFACE_BUTTONS = """
-{% if perms.virtualization.edit_vminterface %}
+{% if perms.virtualization.change_vminterface %}
   <span class="dropdown">
   <span class="dropdown">
     <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Add">
     <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Add">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span>
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span>