luci-app-firewall: honour global default policies in per-zone settings

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

3 files changed, 11 insertions, 3 deletions

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 63af69f8a9..80938711e9 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 a7924b1076..6df3bc7f85 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 22f1683fe4..3ac3f6e2fb 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;