Removed additional instances of manually-coded linkify

peteeckel · Jun 10, 2024 · b5e69e5 · b5e69e5
1 parent 9b2708c
commit b5e69e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/netbox_dns/templates/netbox_dns/record.html b/netbox_dns/templates/netbox_dns/record.html
@@ -94,25 +94,25 @@ <h5 class="card-header">Record</h5>
                 {% if object.ptr_record %}
                 <tr>
                     <th scope="row">PTR Record</th>
-                    <td><a href="{% url 'plugins:netbox_dns:record' pk=object.ptr_record.pk %}">{{ object.ptr_record }}</td>
+                    <td>{{ object.ptr_record|linkify }}</td>
                 </tr>
                 {% endif %}
                 {% if object.address_record %}
                 <tr>
                     <th scope="row">Address Record</th>
-                    <td><a href="{% url 'plugins:netbox_dns:record' pk=object.address_record.pk %}">{{ object.address_record }}</td>
+                    <td>{{ object.address_record|linkify }}</td>
                 </tr>
                     {% if object.address_record.ipam_ip_address %}
                     <tr>
                         <th scope="row">IPAM IP Address</th>
-                        <td><a href="{% url 'ipam:ipaddress' pk=object.address_record.ipam_ip_address.pk %}">{{ object.address_record.ipam_ip_address }}</td>
+                        <td>{{ object.address_record.ipam_ip_address|linkify }}</td>
                     </tr>
                     {% endif %}
                 {% endif %}
                 {% if object.ipam_ip_address %}
                 <tr>
                     <th scope="row">IPAM IP Address</th>
-                    <td><a href="{% url 'ipam:ipaddress' pk=object.ipam_ip_address.pk %}">{{ object.ipam_ip_address }}</td>
+                    <td>{{ object.ipam_ip_address|linkify }}</td>
                 </tr>
                 {% endif %}
                 <tr>

diff --git a/netbox_dns/templates/netbox_dns/zone.html b/netbox_dns/templates/netbox_dns/zone.html
@@ -54,13 +54,7 @@ <h5 class="card-header">
                     <td>
                         <table>
                             {% for nameserver in object.nameservers.all %}
-                            <tr>
-                                <td>
-                                    <a href="{% url 'plugins:netbox_dns:nameserver' pk=nameserver.pk %}">
-                                        {{ nameserver }}
-                                    </a>
-                                </td>
-                            </tr>
+                            <tr><td>{{ nameserver|linkify }}</td></tr>
                             {% endfor %}
                         </table>
                     </td>
@@ -117,7 +111,7 @@ <h5 class="card-header">Zone SOA</h5>
                 </tr>
                 <tr>
                     <th scope="row">MName</th>
-                    <td><a href="{% url 'plugins:netbox_dns:nameserver' pk=object.soa_mname.pk %}">{{ object.soa_mname }}</a></td>
+                    <td>{{ object.soa_mname|linkify }}</td>
                 </tr>
                 <tr>
                     <th scope="row">RName</th>
@@ -167,7 +161,7 @@ <h5 class="card-header">RFC2317</h5>
                 {% if object.rfc2317_parent_managed %}
                 <tr>
                     <th scope="row">Parent Zone</th>
-                    <td><a href="{% url 'plugins:netbox_dns:zone' pk=object.rfc2317_parent_zone.pk %}">{{ object.rfc2317_parent_zone }}</a></td>
+                    <td>{{ object.rfc2317_parent_zone|linkify }}</td>
                 </tr>
                 {% endif %}
             </table>