openstack
/
neutron-vpnaas-dashboard
Code Issues Proposed changes

Merge "Replace None with - (hyphen) for value None"

This commit is contained in:
Zuul 2018-02-03 18:37:17 +00:00 committed by Gerrit Code Review
parent d7722d532f f0b7755662
commit e0ab793bc0
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_vpnaas_dashboard/dashboards/project/vpn/templates/vpn/_endpointgroup_details.html
View File

@ -3,10 +3,10 @@
<div class="detail">
<dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt>
<dd>{{ endpointgroup.name|default:_("None") }}</dd>
<dd>{{ endpointgroup.name|default:_("-") }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ endpointgroup.description|default:_("None") }}</dd>
<dd>{{ endpointgroup.description|default:_("-") }}</dd>
<dt>{% trans "ID" %}</dt>
<dd>{{ endpointgroup.id }}</dd>

4
neutron_vpnaas_dashboard/dashboards/project/vpn/templates/vpn/_ikepolicy_details.html
View File

@ -3,10 +3,10 @@
<div class="detail">
<dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt>
<dd data-display="{{ ikepolicy.name_or_id }}">{{ ikepolicy.name|default:_("None") }}</dd>
<dd data-display="{{ ikepolicy.name_or_id }}">{{ ikepolicy.name|default:_("-") }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ ikepolicy.description|default:_("None") }}</dd>
<dd>{{ ikepolicy.description|default:_("-") }}</dd>
<dt>{% trans "ID" %}</dt>
<dd>{{ ikepolicy.id }}</dd>

4
neutron_vpnaas_dashboard/dashboards/project/vpn/templates/vpn/_ipsecpolicy_details.html
View File

@ -3,10 +3,10 @@
<div class="detail">
<dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt>
<dd data-display="{{ ipsecpolicy.name_or_id }}">{{ ipsecpolicy.name|default:_("None") }}</dd>
<dd data-display="{{ ipsecpolicy.name_or_id }}">{{ ipsecpolicy.name|default:_("-") }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ ipsecpolicy.description|default:_("None") }}</dd>
<dd>{{ ipsecpolicy.description|default:_("-") }}</dd>
<dt>{% trans "ID" %}</dt>
<dd>{{ ipsecpolicy.id }}</dd>

4
neutron_vpnaas_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
View File

@ -3,10 +3,10 @@
<div class="detail">
<dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt>
<dd data-display="{{ ipsecsiteconnection.name_or_id }}">{{ ipsecsiteconnection.name|default:_("None") }}</dd>
<dd data-display="{{ ipsecsiteconnection.name_or_id }}">{{ ipsecsiteconnection.name|default:_("-") }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ ipsecsiteconnection.description|default:_("None") }}</dd>
<dd>{{ ipsecsiteconnection.description|default:_("-") }}</dd>
<dt>{% trans "ID" %}</dt>
<dd>{{ ipsecsiteconnection.id }}</dd>

12
neutron_vpnaas_dashboard/dashboards/project/vpn/templates/vpn/_vpnservice_details.html
View File

@ -3,10 +3,10 @@
<div class="detail">
<dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt>
<dd data-display="{{ vpnservice.name_or_id }}">{{ vpnservice.name|default:_("None") }}</dd>
<dd data-display="{{ vpnservice.name_or_id }}">{{ vpnservice.name|default:_("-") }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ vpnservice.description|default:_("None") }}</dd>
<dd>{{ vpnservice.description|default:_("-") }}</dd>
<dt>{% trans "ID" %}</dt>
<dd>{{ vpnservice.id }}</dd>
@ -23,7 +23,7 @@
{% url 'horizon:project:networks:subnets:detail' vpnservice.subnet_id as subnet_url %}
<dd><a href="{{ subnet_url }}">{{ vpnservice.subnet.name_or_id }} {{ vpnservice.subnet.cidr }}</a></dd>
{% else %}
<dd>{% trans "None" %}</dd>
<dd>{% trans "-" %}</dd>
{% endif %}
<dt>{% trans "VPN Connections" %}</dt>
@ -34,7 +34,7 @@
<a href="{{ conn_url }}">{{ conn.name_or_id }}</a><br>
{% endfor %}
{% else %}
None
{% trans "-" %}
{% endif %}
</dd>
@ -50,9 +50,9 @@
<hr class="header_rule">
<dl class="dl-horizontal">
<dt>{% trans "IPv4" %}</dt>
<dd>{{ vpnservice.external_v4_ip|default:_("None") }}</dd>
<dd>{{ vpnservice.external_v4_ip|default:_("-") }}</dd>
<dt>{% trans "IPv6" %}</dt>
<dd>{{ vpnservice.external_v6_ip|default:_("None") }}</dd>
<dd>{{ vpnservice.external_v6_ip|default:_("-") }}</dd>
</dl>
{% endif %}
</div>