mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Introduce linkify template filter

Browse Source
This commit is contained in:
jeremystretch
2022-03-22 14:51:20 -04:00
parent dc92e19f76
commit 75dae5fbe8
68 changed files with 240 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/templates/ipam/aggregate.html
View File

@@ -31,9 +31,9 @@
<td>
{% if object.tenant %}
{% if prefix.object.group %}
<a href="{{ object.tenant.group.get_absolute_url }}">{{ object.tenant.group }}</a> /
{{ object.tenant.group|linkify }} /
{% endif %}
<a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
{{ object.tenant|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}

6
netbox/templates/ipam/asn.html
View File

@@ -30,10 +30,10 @@
<td>Tenant</td>
<td>
{% if object.tenant %}
{% if prefix.object.group %}
<a href="{{ object.tenant.group.get_absolute_url }}">{{ object.tenant.group }}</a> /
{% if object.tenant.group %}
{{ object.tenant.group|linkify }} /
{% endif %}
<a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
{{ object.tenant|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}

2
netbox/templates/ipam/inc/panels/fhrp_groups.html
View File

@@ -24,7 +24,7 @@
</td>
<td>
{% for ipaddress in assignment.group.ip_addresses.all %}
<a href="{{ ipaddress.get_absolute_url }}">{{ ipaddress }}</a>
{{ ipaddress|linkify }}
{% if not forloop.last %}<br />{% endif %}
{% endfor %}
</td>

20
netbox/templates/ipam/ipaddress.html
View File

@@ -38,9 +38,9 @@
<td>
{% if object.tenant %}
{% if object.tenant.group %}
<a href="{{ object.tenant.group.get_absolute_url }}">{{ object.tenant.group }}</a> /
{{ object.tenant.group|linkify }} /
{% endif %}
<a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
{{ object.tenant|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}
@@ -73,9 +73,9 @@
<td>
{% if object.assigned_object %}
{% if object.assigned_object.parent_object %}
<a href="{{ object.assigned_object.parent_object.get_absolute_url }}">{{ object.assigned_object.parent_object }}</a> /
{{ object.assigned_object.parent_object|linkify }} /
{% endif %}
<a href="{{ object.assigned_object.get_absolute_url }}">{{ object.assigned_object }}
{{ object.assigned_object|linkify }}
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
@@ -85,9 +85,9 @@
<th scope="row">NAT (inside)</th>
<td>
{% if object.nat_inside %}
<a href="{{ object.nat_inside.get_absolute_url }}">{{ object.nat_inside }}</a>
{{ object.nat_inside|linkify }}
{% if object.nat_inside.assigned_object %}
(<a href="{{ object.nat_inside.assigned_object.parent_object.get_absolute_url }}">{{ object.nat_inside.assigned_object.parent_object }}</a>)
({{ object.nat_inside.assigned_object.parent_object|linkify }})
{% endif %}
{% else %}
<span class="text-muted">None</span>
@@ -96,13 +96,7 @@
</tr>
<tr>
<th scope="row">NAT (outside)</th>
<td>
{% if object.nat_outside %}
<a href="{{ object.nat_outside.get_absolute_url }}">{{ object.nat_outside }}</a>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</td>
<td>{{ object.nat_outside|linkify|placeholder }}</td>
</tr>
</table>
</div>

14
netbox/templates/ipam/iprange.html
View File

@@ -37,7 +37,7 @@
<th scope="row">VRF</th>
<td>
{% if object.vrf %}
<a href="{{ object.vrf.get_absolute_url }}">{{ object.vrf }}</a> ({{ object.vrf.rd }})
{{ object.vrf|linkify }} ({{ object.vrf.rd }})
{% else %}
<span>Global</span>
{% endif %}
@@ -45,13 +45,7 @@
</tr>
<tr>
<th scope="row">Role</th>
<td>
{% if object.role %}
<a href="{{ object.role.get_absolute_url }}">{{ object.role }}</a>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</td>
<td>{{ object.role|linkify|placeholder }}</td>
</tr>
<tr>
<th scope="row">Status</th>
@@ -62,9 +56,9 @@
<td>
{% if object.tenant %}
{% if object.tenant.group %}
<a href="{{ object.tenant.group.get_absolute_url }}">{{ object.tenant.group }}</a> /
{{ object.tenant.group|linkify }} /
{% endif %}
<a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
{{ object.tenant|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}

20
netbox/templates/ipam/prefix.html
View File

@@ -29,9 +29,9 @@
<td>
{% if object.tenant %}
{% if object.tenant.group %}
<a href="{{ object.tenant.group.get_absolute_url }}">{{ object.tenant.group }}</a> /
{{ object.tenant.group|linkify }} /
{% endif %}
<a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
{{ object.tenant|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}
@@ -52,9 +52,9 @@
<td>
{% if object.site %}
{% if object.site.region %}
<a href="{{ object.site.region.get_absolute_url }}">{{ object.site.region }}</a> /
{{ object.site.region|linkify }} /
{% endif %}
<a href="{{ object.site.get_absolute_url }}">{{ object.site }}</a>
{{ object.site|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}
@@ -65,9 +65,9 @@
<td>
{% if object.vlan %}
{% if object.vlan.group %}
<a href="{{ object.vlan.group.get_absolute_url }}">{{ object.vlan.group }}</a> /
{{ object.vlan.group|linkify }} /
{% endif %}
<a href="{% url 'ipam:vlan' pk=object.vlan.pk %}">{{ object.vlan }}</a>
{{ object.vlan|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}
@@ -79,13 +79,7 @@
</tr>
<tr>
<th scope="row">Role</th>
<td>
{% if object.role %}
<a href="{{ object.role.get_absolute_url }}">{{ object.role }}</a>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</td>
<td>{{ object.role|linkify|placeholder }}</td>
</tr>
<tr>
<th scope="row">Description</th>

8
netbox/templates/ipam/routetarget.html
View File

@@ -15,13 +15,7 @@
</tr>
<tr>
<th scope="row">Tenant</th>
<td>
{% if object.tenant %}
<a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</td>
<td>{{ object.tenant|linkify|placeholder }}</td>
</tr>
<tr>
<th scope="row">Description</th>

6
netbox/templates/ipam/service.html
View File

@@ -28,9 +28,7 @@
</tr>
<tr>
<th scope="row">Parent</th>
<td>
<a href="{{ object.parent.get_absolute_url }}">{{ object.parent }}</a>
</td>
<td>{{ object.parent|linkify }}</td>
</tr>
<tr>
<th scope="row">Protocol</th>
@@ -44,7 +42,7 @@
<th scope="row">IP Addresses</th>
<td>
{% for ipaddress in object.ipaddresses.all %}
<a href="{{ ipaddress.get_absolute_url }}">{{ ipaddress }}</a><br />
{{ ipaddress|linkify }}<br />
{% empty %}
<span class="text-muted">None</span>
{% endfor %}

16
netbox/templates/ipam/vlan.html
View File

@@ -17,9 +17,9 @@
<td>
{% if object.site %}
{% if object.site.region %}
<a href="{{ object.site.region.get_absolute_url }}">{{ object.site.region }}</a> /
{{ object.site.region|linkify }} /
{% endif %}
<a href="{{ object.site.get_absolute_url }}">{{ object.site }}</a>
{{ object.site|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}
@@ -27,13 +27,7 @@
</tr>
<tr>
<th scope="row">Group</th>
<td>
{% if object.group %}
<a href="{{ object.group.get_absolute_url }}">{{ object.group }}</a>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</td>
<td>{{ object.group|linkify|placeholder }}</td>
</tr>
<tr>
<th scope="row">VLAN ID</th>
@@ -48,9 +42,9 @@
<td>
{% if object.tenant %}
{% if object.tenant.group %}
<a href="{{ object.tenant.group.get_absolute_url }}">{{ object.tenant.group }}</a> /
{{ object.tenant.group|linkify }} /
{% endif %}
<a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
{{ object.tenant|linkify }}
{% else %}
<span class="text-muted">None</span>
{% endif %}

9
netbox/templates/ipam/vlangroup.html
View File

@@ -7,7 +7,7 @@
{{ block.super }}
{% if object.scope %}
{# TODO: This should link to a filtered list of VLANGroups #}
<li class="breadcrumb-item"><a href="{{ object.scope.get_absolute_url }}">{{ object.scope }}</a></li>
<li class="breadcrumb-item">{{ object.scope|linkify }}</li>
{% endif %}
{% endblock %}
@@ -36,12 +36,7 @@
</tr>
<tr>
<th scope="row">Scope</th>
<td>
{% if object.scope %}
<a href="{{ object.scope.get_absolute_url }}">{{ object.scope }}</a>
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
<td>{{ object.scope|linkify|placeholder }}</td>
</tr>
<tr>
<th scope="row">Permitted VIDs</th>

8
netbox/templates/ipam/vrf.html
View File

@@ -20,13 +20,7 @@
</tr>
<tr>
<th scope="row">Tenant</th>
<td>
{% if object.tenant %}
<a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</td>
<td>{{ object.tenant|linkify|placeholder }}</td>
</tr>
<tr>
<th scope="row">Unique IP Space</th>