diff options
Diffstat (limited to 'applications')
4 files changed, 17 insertions, 17 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 4d13752b3a..62b792da1f 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 @@ -7,28 +7,22 @@ 'require tools.widgets as widgets'; return L.view.extend({ - callOffloadSupport: rpc.declare({ - object: 'luci', - method: 'offload_support', - expect: { offload_support: false } - }), - callConntrackHelpers: rpc.declare({ object: 'luci', - method: 'conntrack_helpers', - expect: { helpers: [] } + method: 'getConntrackHelpers', + expect: { result: [] } }), load: function() { return Promise.all([ - this.callOffloadSupport(), - this.callConntrackHelpers() + this.callConntrackHelpers(), + firewall.getDefaults() ]); }, render: function(data) { - var hasOffloading = data[0], - ctHelpers = data[1], + var ctHelpers = data[0], + fwDefaults = data[1], m, s, o, inp, out; m = new form.Map('firewall', _('Firewall - Zone Settings'), @@ -55,7 +49,7 @@ return L.view.extend({ /* Netfilter flow offload support */ - if (hasOffloading) { + if (L.hasSystemFeature('offloading')) { s = m.section(form.TypedSection, 'defaults', _('Routing/NAT Offloading'), _('Experimental feature. Not fully compatible with QoS/SQM.')); @@ -126,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; diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua index d3596637b2..cb7ae53afa 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua @@ -48,12 +48,12 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) data = { types = { "percent" }, options = { - percent = { title = "%di Hz", negweight = true }, + percent = { title = "%di kHz", negweight = true }, } } } - return { cpufreq, transitions, percentage } + return { cpufreq, percentage, transitions } else return { cpufreq } end |