diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-08-14 17:07:55 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-08-14 22:58:15 +0200 |
| commit | ed8f1c4c1c47465f79ddaf6af118d1dd29ee7d12 (patch) | |
| tree | 914ae840352c37975e7053bbd2a60fb743eff34a /modules/luci-mod-network | |
| parent | 7610f1d9cfc64f2841faf3f74db6976dc0c190bc (diff) | |
luci-app-firewall: honour global default policies in per-zone settings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-network')
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js | 9 | ||||
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index 7035dc476..1e9c402e0 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -7,17 +7,19 @@ var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus; callHostHints = rpc.declare({ object: 'luci', - method: 'host_hints' + method: 'getHostHints', + expect: { '': {} } }); callDUIDHints = rpc.declare({ object: 'luci', - method: 'duid_hints' + method: 'getDUIDHints', + expect: { '': {} } }); callDHCPLeases = rpc.declare({ object: 'luci', - method: 'leases', + method: 'getDHCPLeases', params: [ 'family' ], expect: { dhcp_leases: [] } }); @@ -57,7 +59,6 @@ return L.view.extend({ m, s, o, ss, so; m = new form.Map('dhcp', _('DHCP and DNS'), _('Dnsmasq is a combined <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Server and <abbr title="Domain Name System">DNS</abbr>-Forwarder for <abbr title="Network Address Translation">NAT</abbr> firewalls')); - m.tabbed = true; s = m.section(form.TypedSection, 'dnsmasq', _('Server Settings')); s.anonymous = true; diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js index 2a49b0481..3cdea8adb 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js @@ -5,7 +5,8 @@ return L.view.extend({ callHostHints: rpc.declare({ object: 'luci', - method: 'host_hints' + method: 'getHostHints', + expect: { '': {} } }), load: function() { |