Browse Source

type default output if ip does not exist

devel
Dmitry Novikov 8 years ago
parent
commit
c4648b9dcc
  1. 2
      abonapp/templates/abonapp/editAbon.html
  2. 2
      clientsideapp/templates/clientsideapp/index.html
  3. 2
      devapp/templates/devapp/add_dev.html
  4. 2
      devapp/templates/devapp/devices.html
  5. 2
      devapp/templates/devapp/ext.htm

2
abonapp/templates/abonapp/editAbon.html

@ -148,7 +148,7 @@
<div class="col-sm-8 btn-group btn-group-sm"> <div class="col-sm-8 btn-group btn-group-sm">
{% if device %} {% if device %}
<a href="{% url 'devapp:view' group.pk device.pk %}" target="_blank" class="btn btn-sm btn-default" title="{% trans 'Mac Address' %}: {{ device.mac_addr|default:_('Not assigned') }}"> <a href="{% url 'devapp:view' group.pk device.pk %}" target="_blank" class="btn btn-sm btn-default" title="{% trans 'Mac Address' %}: {{ device.mac_addr|default:_('Not assigned') }}">
<span class="glyphicon glyphicon-hdd"></span> <span class="hidden-md">{{ device.comment|truncatechars:11 }} {{ device.ip_address }}</span>
<span class="glyphicon glyphicon-hdd"></span> <span class="hidden-md">{{ device.comment|truncatechars:11 }} {{ device.ip_address|default:'' }}</span>
</a> </a>
<a href="{% url 'abonapp:clear_dev' group.pk abon.username %}" class="btn btn-sm btn-danger"> <a href="{% url 'abonapp:clear_dev' group.pk abon.username %}" class="btn btn-sm btn-danger">
<span class="glyphicon glyphicon-remove-circle"></span> <span class="hidden-xs hidden-lg">{% trans 'Remove clutch' %}</span> <span class="glyphicon glyphicon-remove-circle"></span> <span class="hidden-xs hidden-lg">{% trans 'Remove clutch' %}</span>

2
clientsideapp/templates/clientsideapp/index.html

@ -18,7 +18,7 @@
<dd>{{ user.telephone }}</dd> <dd>{{ user.telephone }}</dd>
<dt>{% trans 'Ip Address' %}</dt> <dt>{% trans 'Ip Address' %}</dt>
<dd>{{ user.ip_address }}</dd>
<dd>{{ user.ip_address|default:'' }}</dd>
{% if user.street %} {% if user.street %}
<dt>{% trans 'Address' %}</dt> <dt>{% trans 'Address' %}</dt>

2
devapp/templates/devapp/add_dev.html

@ -51,7 +51,7 @@
{% if selected_parent_dev %} {% if selected_parent_dev %}
<button class="selectajax-btn form-control btn btn-default"> <button class="selectajax-btn form-control btn btn-default">
{{ selected_parent_dev.ip_address }}: {{ selected_parent_dev.comment }}
{{ selected_parent_dev.ip_address|default:'' }}: {{ selected_parent_dev.comment }}
</button> </button>
{% else %} {% else %}
<button class="selectajax-btn form-control btn btn-default hidden"></button> <button class="selectajax-btn form-control btn btn-default hidden"></button>

2
devapp/templates/devapp/devices.html

@ -59,7 +59,7 @@
{% endif %} {% endif %}
</a> </a>
</td> </td>
<td><a href="{{ viewurl }}">{{ dev.ip_address }}</a></td>
<td><a href="{{ viewurl }}">{{ dev.ip_address|default:'' }}</a></td>
<td>{{ dev.comment }}</td> <td>{{ dev.comment }}</td>
<td>{{ dev.mac_addr|default:_('Not assigned') }}</td> <td>{{ dev.mac_addr|default:_('Not assigned') }}</td>
<td>{{ dev.get_devtype_display }}</td> <td>{{ dev.get_devtype_display }}</td>

2
devapp/templates/devapp/ext.htm

@ -28,7 +28,7 @@
{% url 'devapp:view' dev.group.pk|default:0 dev.pk as devapp_view %} {% url 'devapp:view' dev.group.pk|default:0 dev.pk as devapp_view %}
<li{% if devapp_view == request.path %} class="active"{% endif %}> <li{% if devapp_view == request.path %} class="active"{% endif %}>
<a href="{{ devapp_view }}"> <a href="{{ devapp_view }}">
{% trans 'View' %} {{ dev.ip_address }}
{% trans 'View' %} {{ dev.ip_address|default:'' }}
</a> </a>
</li> </li>

Loading…
Cancel
Save