Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / applications / luci-app-firewall / htdocs / luci-static / resources / view / firewall / zones.js

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
index 41840a2268021262ae19be537c69769991c4d085..78a6626266c3776a6b5c5be56472a1049e8d1dee 100644 (file)
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
@@ -84,7 +84,8 @@ return L.view.extend({
                o.modalonly = true;
                o.cfgvalue = function(section_id) {
                        var name = uci.get('firewall', section_id, 'name');
-
+                       if (name == null)
+                               name = _("this new zone");
                        return _('This section defines common properties of %q. The <em>input</em> and <em>output</em> options set the default policies for traffic entering and leaving this zone while the <em>forward</em> option describes the policy for forwarded traffic between different networks within the zone. <em>Covered networks</em> specifies which available networks are members of this zone.')
                                .replace(/%s/g, name).replace(/%q/g, '"' + name + '"');
                };
@@ -168,7 +169,8 @@ return L.view.extend({
                o.modalonly = true;
                o.cfgvalue = function(section_id) {
                        var name = uci.get('firewall', section_id, 'name');
-
+                       if (name == null)
+                               name = _("this new zone");
                        return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
                                .format(name);
                };
@@ -258,8 +260,11 @@ return L.view.extend({
                o.rawhtml = true;
                o.modalonly = true;
                o.cfgvalue = function(section_id) {
+                       var name = uci.get('firewall', section_id, 'name');
+                       if (name == null)
+                               name = _("this new zone");
                        return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
-                               .format(uci.get('firewall', section_id, 'name'));
+                               .format(name);
                };
 
                out = o = s.taboption('general', widgets.ZoneSelect, 'out', _('Allow forward to <em>destination zones</em>:'));