From ed8f1c4c1c47465f79ddaf6af118d1dd29ee7d12 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 14 Aug 2019 17:07:55 +0200 Subject: luci-app-firewall: honour global default policies in per-zone settings Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/resources/view/firewall/forwards.js | 3 ++- .../htdocs/luci-static/resources/view/firewall/rules.js | 3 ++- .../htdocs/luci-static/resources/view/firewall/zones.js | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'applications') diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js index 63af69f8a..80938711e 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js @@ -75,7 +75,8 @@ function forward_via_txt(s) { return L.view.extend({ callHostHints: rpc.declare({ object: 'luci', - method: 'host_hints' + method: 'getHostHints', + expect: { '': {} } }), load: function() { diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js index a7924b107..6df3bc7f8 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js @@ -112,7 +112,8 @@ function rule_target_txt(s) { return L.view.extend({ callHostHints: rpc.declare({ object: 'luci', - method: 'host_hints' + method: 'getHostHints', + expect: { '': {} } }), load: function() { 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 22f1683fe..3ac3f6e2f 100644 --- 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 @@ -15,12 +15,14 @@ return L.view.extend({ load: function() { return Promise.all([ - this.callConntrackHelpers() + this.callConntrackHelpers(), + firewall.getDefaults() ]); }, render: function(data) { var ctHelpers = data[0], + fwDefaults = data[1], m, s, o, inp, out; m = new form.Map('firewall', _('Firewall - Zone Settings'), @@ -118,6 +120,10 @@ return L.view.extend({ p[i].editable = true; } + p[0].default = fwDefaults.getInput(); + p[1].default = fwDefaults.getOutput(); + p[2].default = fwDefaults.getForward(); + o = s.taboption('general', form.Flag, 'masq', _('Masquerading')); o.editable = true; -- cgit v1.2.3