From c4648b9dcce18fdd2396c28873c5a1da2cc60f9e Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Tue, 31 Jul 2018 22:48:03 +0300 Subject: [PATCH] type default output if ip does not exist --- abonapp/templates/abonapp/editAbon.html | 2 +- clientsideapp/templates/clientsideapp/index.html | 2 +- devapp/templates/devapp/add_dev.html | 2 +- devapp/templates/devapp/devices.html | 2 +- devapp/templates/devapp/ext.htm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index ed9a8ad..d87eb2a 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -148,7 +148,7 @@
{% if device %} - {{ device.comment|truncatechars:11 }} {{ device.ip_address }} + {{ device.comment|truncatechars:11 }} {{ device.ip_address|default:'' }} diff --git a/clientsideapp/templates/clientsideapp/index.html b/clientsideapp/templates/clientsideapp/index.html index 3ac7e35..1816629 100644 --- a/clientsideapp/templates/clientsideapp/index.html +++ b/clientsideapp/templates/clientsideapp/index.html @@ -18,7 +18,7 @@
{{ user.telephone }}
{% trans 'Ip Address' %}
-
{{ user.ip_address }}
+
{{ user.ip_address|default:'' }}
{% if user.street %}
{% trans 'Address' %}
diff --git a/devapp/templates/devapp/add_dev.html b/devapp/templates/devapp/add_dev.html index 30fbb9c..abe1098 100644 --- a/devapp/templates/devapp/add_dev.html +++ b/devapp/templates/devapp/add_dev.html @@ -51,7 +51,7 @@ {% if selected_parent_dev %} {% else %} diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html index 50ab582..5d3013b 100644 --- a/devapp/templates/devapp/devices.html +++ b/devapp/templates/devapp/devices.html @@ -59,7 +59,7 @@ {% endif %}
- {{ dev.ip_address }} + {{ dev.ip_address|default:'' }} {{ dev.comment }} {{ dev.mac_addr|default:_('Not assigned') }} {{ dev.get_devtype_display }} diff --git a/devapp/templates/devapp/ext.htm b/devapp/templates/devapp/ext.htm index b7ee865..4f05db1 100644 --- a/devapp/templates/devapp/ext.htm +++ b/devapp/templates/devapp/ext.htm @@ -28,7 +28,7 @@ {% url 'devapp:view' dev.group.pk|default:0 dev.pk as devapp_view %} - {% trans 'View' %} {{ dev.ip_address }} + {% trans 'View' %} {{ dev.ip_address|default:'' }}