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

Replace None in templates with placeholder filter

Browse Source 
To be consistent, all uses of — or None is replaced with the
placeholder filter.

Fixes #9537
This commit is contained in:
Kim Johansson
2022-06-15 22:33:21 +02:00
parent 83fdfaa0eb
commit e8b970608e
25 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/templates/circuits/circuit_terminations_swap.html
View File

@ -10,7 +10,7 @@
{% if termination_a %} {% if termination_a %}
{{ termination_a.site }} {% if termination_a.interface %}- {{ termination_a.interface.device }} {{ termination_a.interface }}{% endif %} {{ termination_a.site }} {% if termination_a.interface %}- {{ termination_a.interface.device }} {{ termination_a.interface }}{% endif %}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</li> </li>
<li> <li>
@ -18,7 +18,7 @@
{% if termination_z %} {% if termination_z %}
{{ termination_z.site }} {% if termination_z.interface %}- {{ termination_z.interface.device }} {{ termination_z.interface }}{% endif %} {{ termination_z.site }} {% if termination_z.interface %}- {{ termination_z.interface.device }} {{ termination_z.interface }}{% endif %}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</li> </li>
</ul> </ul>

2
netbox/templates/circuits/inc/circuit_termination.html
View File

@ -94,7 +94,7 @@
{% elif termination.port_speed %} {% elif termination.port_speed %}
{{ termination.port_speed|humanize_speed }} {{ termination.port_speed|humanize_speed }}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

2
netbox/templates/circuits/provider.html
View File

@ -50,7 +50,7 @@
{% if object.portal_url %} {% if object.portal_url %}
<a href="{{ object.portal_url }}">{{ object.portal_url }}</a> <a href="{{ object.portal_url }}">{{ object.portal_url }}</a>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

4
netbox/templates/dcim/cable.html
View File

@ -40,7 +40,7 @@
{% if object.color %} {% if object.color %}
<span class="color-label" style="background-color: #{{ object.color }}">&nbsp;</span> <span class="color-label" style="background-color: #{{ object.color }}">&nbsp;</span>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -50,7 +50,7 @@
{% if object.length %} {% if object.length %}
{{ object.length|floatformat }} {{ object.get_length_unit_display }} {{ object.length|floatformat }} {{ object.get_length_unit_display }}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

12
netbox/templates/dcim/device.html
View File

@ -23,7 +23,7 @@
{% endfor %} {% endfor %}
{{ object.site.region|linkify }} {{ object.site.region|linkify }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -40,7 +40,7 @@
{% endfor %} {% endfor %}
{{ object.location|linkify }} {{ object.location|linkify }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -50,7 +50,7 @@
{% if object.rack %} {% if object.rack %}
<a href="{% url 'dcim:rack' pk=object.rack.pk %}">{{ object.rack }}</a> <a href="{% url 'dcim:rack' pk=object.rack.pk %}">{{ object.rack }}</a>
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -69,7 +69,7 @@
{% elif object.rack and object.device_type.u_height %} {% elif object.rack and object.device_type.u_height %}
<span class="badge bg-warning">Not racked</span> <span class="badge bg-warning">Not racked</span>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -180,7 +180,7 @@
(NAT: {{ object.primary_ip4.nat_outside.address.ip|linkify }}) (NAT: {{ object.primary_ip4.nat_outside.address.ip|linkify }})
{% endif %} {% endif %}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -195,7 +195,7 @@
(NAT: {{ object.primary_ip6.nat_outside.address.ip|linkify }}) (NAT: {{ object.primary_ip6.nat_outside.address.ip|linkify }})
{% endif %} {% endif %}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

2
netbox/templates/dcim/devicerole.html
View File

@ -54,7 +54,7 @@
{% if object.vm_role %} {% if object.vm_role %}
<a href="{% url 'virtualization:virtualmachine_list' %}?role_id={{ object.pk }}">{{ virtualmachine_count }}</a> <a href="{% url 'virtualization:virtualmachine_list' %}?role_id={{ object.pk }}">{{ virtualmachine_count }}</a>
{% else %} {% else %}
&mdash; {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

4
netbox/templates/dcim/devicetype.html
View File

@ -55,7 +55,7 @@
<img src="{{ object.front_image.url }}" alt="{{ object.front_image.name }}" class="img-fluid" /> <img src="{{ object.front_image.url }}" alt="{{ object.front_image.name }}" class="img-fluid" />
</a> </a>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -67,7 +67,7 @@
<img src="{{ object.rear_image.url }}" alt="{{ object.rear_image.name }}" class="img-fluid" /> <img src="{{ object.rear_image.url }}" alt="{{ object.rear_image.name }}" class="img-fluid" />
</a> </a>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

8
netbox/templates/dcim/interface.html
View File

@ -321,7 +321,7 @@
{% if object.rf_channel_frequency %} {% if object.rf_channel_frequency %}
{{ object.rf_channel_frequency|simplify_decimal }} MHz {{ object.rf_channel_frequency|simplify_decimal }} MHz
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
{% if peer %} {% if peer %}
@ -329,7 +329,7 @@
{% if peer.rf_channel_frequency %} {% if peer.rf_channel_frequency %}
{{ peer.rf_channel_frequency|simplify_decimal }} MHz {{ peer.rf_channel_frequency|simplify_decimal }} MHz
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
{% endif %} {% endif %}
@ -340,7 +340,7 @@
{% if object.rf_channel_width %} {% if object.rf_channel_width %}
{{ object.rf_channel_width|simplify_decimal }} MHz {{ object.rf_channel_width|simplify_decimal }} MHz
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
{% if peer %} {% if peer %}
@ -348,7 +348,7 @@
{% if peer.rf_channel_width %} {% if peer.rf_channel_width %}
{{ peer.rf_channel_width|simplify_decimal }} MHz {{ peer.rf_channel_width|simplify_decimal }} MHz
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
{% endif %} {% endif %}

2
netbox/templates/dcim/powerfeed.html
View File

@ -44,7 +44,7 @@
{% if object.connected_endpoint %} {% if object.connected_endpoint %}
{{ object.connected_endpoint.device|linkify }} ({{ object.connected_endpoint }}) {{ object.connected_endpoint.device|linkify }} ({{ object.connected_endpoint }})
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

8
netbox/templates/dcim/rack.html
View File

@ -53,7 +53,7 @@
{% endfor %} {% endfor %}
{{ object.location|linkify }} {{ object.location|linkify }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -115,7 +115,7 @@
{% if object.type %} {% if object.type %}
{{ object.get_type_display }} {{ object.get_type_display }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -133,7 +133,7 @@
{% if object.outer_width %} {% if object.outer_width %}
<span>{{ object.outer_width }} {{ object.get_outer_unit_display }}</span> <span>{{ object.outer_width }} {{ object.get_outer_unit_display }}</span>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -143,7 +143,7 @@
{% if object.outer_depth %} {% if object.outer_depth %}
<span>{{ object.outer_depth }} {{ object.get_outer_unit_display }}</span> <span>{{ object.outer_depth }} {{ object.get_outer_unit_display }}</span>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

10
netbox/templates/dcim/site.html
View File

@ -34,7 +34,7 @@
{% endfor %} {% endfor %}
{{ object.region|linkify }} {{ object.region|linkify }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -47,7 +47,7 @@
{% endfor %} {% endfor %}
{{ object.group|linkify }} {{ object.group|linkify }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -79,7 +79,7 @@
{{ object.time_zone }} (UTC {{ object.time_zone|tzoffset }})<br /> {{ object.time_zone }} (UTC {{ object.time_zone|tzoffset }})<br />
<small class="text-muted">Site time: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %}</small> <small class="text-muted">Site time: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %}</small>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -94,7 +94,7 @@
</div> </div>
<span>{{ object.physical_address|linebreaksbr }}</span> <span>{{ object.physical_address|linebreaksbr }}</span>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -113,7 +113,7 @@
</div> </div>
<span>{{ object.latitude }}, {{ object.longitude }}</span> <span>{{ object.latitude }}, {{ object.longitude }}</span>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

2
netbox/templates/dcim/virtualchassis_edit.html
View File

@ -57,7 +57,7 @@
{% if device.rack %} {% if device.rack %}
{{ device.rack }} / {{ device.position }} {{ device.rack }} / {{ device.position }}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
<td>{{ device.serial|placeholder }}</td> <td>{{ device.serial|placeholder }}</td>

4
netbox/templates/extras/customfield.html
View File

@ -57,7 +57,7 @@
{% if object.choices %} {% if object.choices %}
{{ object.choices|join:", " }} {{ object.choices|join:", " }}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -105,7 +105,7 @@
{% if object.validation_regex %} {% if object.validation_regex %}
<code>{{ object.validation_regex }}</code> <code>{{ object.validation_regex }}</code>
{% else %} {% else %}
&mdash; {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

2
netbox/templates/extras/htmx/report_result.html
View File

@ -57,7 +57,7 @@
{% elif obj %} {% elif obj %}
{{ obj }} {{ obj }}
{% else %} {% else %}
<span class="muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
<td class="rendered-markdown">{{ message|markdown }}</td> <td class="rendered-markdown">{{ message|markdown }}</td>

4
netbox/templates/generic/bulk_import.html
View File

@ -76,14 +76,14 @@ Context:
{% if field.required %} {% if field.required %}
{% checkmark True true="Required" %} {% checkmark True true="Required" %}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
<td> <td>
{% if field.to_field_name %} {% if field.to_field_name %}
<code>{{ field.to_field_name }}</code> <code>{{ field.to_field_name }}</code>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
<td> <td>

2
netbox/templates/inc/panels/custom_fields.html
View File

@ -37,7 +37,7 @@
{% elif field.required %} {% elif field.required %}
<span class="text-warning">Not defined</span> <span class="text-warning">Not defined</span>
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

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

@ -52,7 +52,7 @@
{% if object.role %} {% if object.role %}
<a href="{% url 'ipam:ipaddress_list' %}?role={{ object.role }}">{{ object.get_role_display }}</a> <a href="{% url 'ipam:ipaddress_list' %}?role={{ object.role }}">{{ object.get_role_display }}</a>
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -73,7 +73,7 @@
{% endif %} {% endif %}
{{ object.assigned_object|linkify }} {{ object.assigned_object|linkify }}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -86,7 +86,7 @@
({{ object.nat_inside.assigned_object.parent_object|linkify }}) ({{ object.nat_inside.assigned_object.parent_object|linkify }})
{% endif %} {% endif %}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

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

@ -39,7 +39,7 @@
{% if aggregate %} {% if aggregate %}
<a href="{% url 'ipam:aggregate' pk=aggregate.pk %}">{{ aggregate.prefix }}</a> ({{ aggregate.rir }}) <a href="{% url 'ipam:aggregate' pk=aggregate.pk %}">{{ aggregate.prefix }}</a> ({{ aggregate.rir }})
{% else %} {% else %}
<span class="text-warning">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -52,7 +52,7 @@
{% endif %} {% endif %}
{{ object.site|linkify }} {{ object.site|linkify }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -65,7 +65,7 @@
{% endif %} {% endif %}
{{ object.vlan|linkify }} {{ object.vlan|linkify }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -138,7 +138,7 @@
{{ first_available_ip }} {{ first_available_ip }}
{% endif %} {% endif %}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</td> </td>

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

@ -45,7 +45,7 @@
{% if ipranges_count %} {% if ipranges_count %}
<a href="{% url 'ipam:iprange_list' %}?role_id={{ object.pk }}">{{ ipranges_count }}</a> <a href="{% url 'ipam:iprange_list' %}?role_id={{ object.pk }}">{{ ipranges_count }}</a>
{% else %} {% else %}
&mdash; {{ ''|placeholder }}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</td> </td>
@ -57,7 +57,7 @@
{% if vlans_count %} {% if vlans_count %}
<a href="{% url 'ipam:vlan_list' %}?role_id={{ object.pk }}">{{ vlans_count }}</a> <a href="{% url 'ipam:vlan_list' %}?role_id={{ object.pk }}">{{ vlans_count }}</a>
{% else %} {% else %}
&mdash; {{ ''|placeholder }}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</td> </td>

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

@ -44,7 +44,7 @@
{% for ipaddress in object.ipaddresses.all %} {% for ipaddress in object.ipaddresses.all %}
{{ ipaddress|linkify }}<br /> {{ ipaddress|linkify }}<br />
{% empty %} {% empty %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>

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

@ -21,7 +21,7 @@
{% endif %} {% endif %}
{{ object.site|linkify }} {{ object.site|linkify }}
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -56,7 +56,7 @@
{% if object.role %} {% if object.role %}
<a href="{% url 'ipam:vlan_list' %}?role={{ object.role.slug }}">{{ object.role }}</a> <a href="{% url 'ipam:vlan_list' %}?role={{ object.role.slug }}">{{ object.role }}</a>
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

4
netbox/templates/tenancy/contact.html
View File

@ -35,7 +35,7 @@
{% if object.phone %} {% if object.phone %}
<a href="tel:{{ object.phone }}">{{ object.phone }}</a> <a href="tel:{{ object.phone }}">{{ object.phone }}</a>
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -45,7 +45,7 @@
{% if object.email %} {% if object.email %}
<a href="mailto:{{ object.email }}">{{ object.email }}</a> <a href="mailto:{{ object.email }}">{{ object.email }}</a>
{% else %} {% else %}
<span class="text-muted">None</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

2
netbox/templates/users/profile.html
View File

@ -21,7 +21,7 @@
{% if request.user.first_name or request.user.last_name %} {% if request.user.first_name or request.user.last_name %}
{{ request.user.first_name }} {{ request.user.last_name }} {{ request.user.first_name }} {{ request.user.last_name }}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

8
netbox/templates/virtualization/virtualmachine.html
View File

@ -49,7 +49,7 @@
(NAT: <a href="{{ object.primary_ip4.nat_outside.get_absolute_url }}">{{ object.primary_ip4.nat_outside.address.ip }}</a>) (NAT: <a href="{{ object.primary_ip4.nat_outside.get_absolute_url }}">{{ object.primary_ip4.nat_outside.address.ip }}</a>)
{% endif %} {% endif %}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -64,7 +64,7 @@
(NAT: <a href="{{ object.primary_ip6.nat_outside.get_absolute_url }}">{{ object.primary_ip6.nat_outside.address.ip }}</a>) (NAT: <a href="{{ object.primary_ip6.nat_outside.get_absolute_url }}">{{ object.primary_ip6.nat_outside.address.ip }}</a>)
{% endif %} {% endif %}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -115,7 +115,7 @@
{% if object.memory %} {% if object.memory %}
{{ object.memory|humanize_megabytes }} {{ object.memory|humanize_megabytes }}
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -125,7 +125,7 @@
{% if object.disk %} {% if object.disk %}
{{ object.disk }} GB {{ object.disk }} GB
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

4
netbox/templates/wireless/inc/wirelesslink_interface.html
View File

@ -33,7 +33,7 @@
{% if interface.rf_channel_frequency %} {% if interface.rf_channel_frequency %}
{{ interface.rf_channel_frequency|simplify_decimal }} MHz {{ interface.rf_channel_frequency|simplify_decimal }} MHz
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -43,7 +43,7 @@
{% if interface.rf_channel_width %} {% if interface.rf_channel_width %}
{{ interface.rf_channel_width|simplify_decimal }} MHz {{ interface.rf_channel_width|simplify_decimal }} MHz
{% else %} {% else %}
<span class="text-muted">&mdash;</span> {{ ''|placeholder }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>