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 / rules.js

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 4252cf36914109828b9d8cfd21aff4e389e8da80..6df3bc7f8550bf425674ee44f1bb8b82d168504e 100644 (file)
--- 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() {
@@ -221,42 +222,44 @@ return L.view.extend({
                o.cast = 'table';
                o.placeholder = _('any');
                o.value('', 'any');
-               o.value('echo-reply');
+               o.value('address-mask-reply');
+               o.value('address-mask-request');
+               o.value('communication-prohibited');
                o.value('destination-unreachable');
-               o.value('network-unreachable');
-               o.value('host-unreachable');
-               o.value('protocol-unreachable');
-               o.value('port-unreachable');
+               o.value('echo-reply');
+               o.value('echo-request');
                o.value('fragmentation-needed');
-               o.value('source-route-failed');
-               o.value('network-unknown');
+               o.value('host-precedence-violation');
+               o.value('host-prohibited');
+               o.value('host-redirect');
                o.value('host-unknown');
+               o.value('host-unreachable');
+               o.value('ip-header-bad');
+               o.value('neighbour-advertisement');
+               o.value('neighbour-solicitation');
                o.value('network-prohibited');
-               o.value('host-prohibited');
-               o.value('TOS-network-unreachable');
-               o.value('TOS-host-unreachable');
-               o.value('communication-prohibited');
-               o.value('host-precedence-violation');
+               o.value('network-redirect');
+               o.value('network-unknown');
+               o.value('network-unreachable');
+               o.value('parameter-problem');
+               o.value('port-unreachable');
                o.value('precedence-cutoff');
-               o.value('source-quench');
+               o.value('protocol-unreachable');
                o.value('redirect');
-               o.value('network-redirect');
-               o.value('host-redirect');
-               o.value('TOS-network-redirect');
-               o.value('TOS-host-redirect');
-               o.value('echo-request');
+               o.value('required-option-missing');
                o.value('router-advertisement');
                o.value('router-solicitation');
+               o.value('source-quench');
+               o.value('source-route-failed');
                o.value('time-exceeded');
-               o.value('ttl-zero-during-transit');
-               o.value('ttl-zero-during-reassembly');
-               o.value('parameter-problem');
-               o.value('ip-header-bad');
-               o.value('required-option-missing');
-               o.value('timestamp-request');
                o.value('timestamp-reply');
-               o.value('address-mask-request');
-               o.value('address-mask-reply');
+               o.value('timestamp-request');
+               o.value('TOS-host-redirect');
+               o.value('TOS-host-unreachable');
+               o.value('TOS-network-redirect');
+               o.value('TOS-network-unreachable');
+               o.value('ttl-zero-during-reassembly');
+               o.value('ttl-zero-during-transit');
                o.depends('proto', 'icmp');
 
                o = s.taboption('general', widgets.ZoneSelect, 'src', _('Source zone'));