diff --git a/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/configure.js b/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/configure.js index 94321b7a65..4bea64a8bf 100644 --- a/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/configure.js +++ b/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/configure.js @@ -257,7 +257,7 @@ return view.extend({ const qrs = s.taboption('resource', form.Flag, 'query_min_strict', _('Strict Minimize'), _("Strict version of 'query minimize' but it can break DNS")); - qrs.taboptional = true; + qrs.optional = true; qrs.depends('query_minimize', '1'); const eds = s.taboption('resource', form.Value, 'edns_size', _('EDNS Size'), diff --git a/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/files.js b/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/files.js index e610829e67..78163421ac 100644 --- a/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/files.js +++ b/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/files.js @@ -111,7 +111,7 @@ return view.extend({ if (dhcp_c.content) { s.tab('dhcp', _('Show: DHCP')); - const dhcp_msg = s.taboption('manual', form.DummyValue, '_dhcp_msg', ''); + const dhcp_msg = s.taboption('dhcp', form.DummyValue, '_dhcp_msg', ''); dhcp_msg.default = _("This shows '" + FILENAMES['dhcp'] + "' list of hosts from DHCP hook scripts."); const dhcp = s.taboption('dhcp', form.TextValue, 'dhcp'); dhcp.rows = 25; diff --git a/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/status.js b/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/status.js index 49e1a47e7d..1d7fa00719 100644 --- a/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/status.js +++ b/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/status.js @@ -13,7 +13,11 @@ return view.extend({ if (!stat) { return Promise.all([ L.resolveDefault(fs.stat('/sbin/logread'), {path: ''}), - L.resolveDefault('', {path: ''}), + Promise.resolve({ path: '' }), + Promise.resolve(null), + Promise.resolve(null), + Promise.resolve(null), + Promise.resolve(null), ]); } else { return Promise.all([ @@ -58,7 +62,7 @@ return view.extend({ L.Poll.add(() => { return L.resolveDefault(fs.exec_direct('/usr/sbin/unbound-control', ['-c', '/var/lib/unbound/unbound.conf', 'list_local_zones'])).then(function(res) { const zd = document.getElementById("zones_data"); - zd.value = res ? rest.trim() :_('No zones data yet!'); + zd.value = res ? res.trim() :_('No zones data yet!'); zd.scrollTop = zd.scrollHeight; }); }); diff --git a/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/zones.js b/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/zones.js index 9c03ca0ede..55900d7391 100644 --- a/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/zones.js +++ b/applications/luci-app-unbound/htdocs/luci-static/resources/view/unbound/zones.js @@ -7,7 +7,6 @@ 'require view'; const RESOLV_FILE = '/tmp/resolv.conf.d/resolv.conf.auto'; -const LOGERR_CMD = "logread -e 'unbound.*error.*ssl library'"; const HELP_URL = 'https://github.com/openwrt/packages/blob/master/net/unbound/files/README.md'; let section_enabled = false; @@ -24,7 +23,7 @@ return view.extend({ load() { return Promise.all([ fs.read(RESOLV_FILE).catch(() => ''), - fs.exec(LOGERR_CMD).catch(() => ''), + fs.exec('/sbin/logread', ['-e', 'unbound.*error.*ssl library']).catch(() => ''), uci.load('unbound'), ]).then(([resolv, logerr]) => ({ resolvContent: resolv || '',