diff --git a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js index 1d78562..ef8f180 100644 --- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js +++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js @@ -133,17 +133,28 @@ return view.extend({ poll.stop(); - let res = fs.exec('/opr/zapret/sync_config.sh'); - if (res.code != 0) { - ui.addNotification(null, E('p', _('Unable to run sync_config.sh') + ' [code: '+res.code+']')); - return res; - } - return tools.handleServiceAction(tools.appName, action).then(() => { - return this.getAppStatus().then( - (status_array) => { - this.setAppStatus(status_array); - } - ); + let _this = this; + + return fs.exec('/opt/zapret/sync_config.sh') + .then(function(res) { + if (res.code != 0) { + ui.addNotification(null, E('p', _('Unable to run sync_config.sh script.') + ' res.code = ' + res.code)); + return _this.getAppStatus().then( + (status_array) => { + _this.setAppStatus(status_array); + } + ); + } + return tools.handleServiceAction(tools.appName, action).then(() => { + return _this.getAppStatus().then( + (status_array) => { + _this.setAppStatus(status_array); + } + ); + }); + }) + .catch(e => { + ui.addNotification(null, E('p', _('Unable to run sync_config.sh script.') + ' Error: ' + e.message)); }); }, diff --git a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js index c50b2d0..9d45a48 100644 --- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js +++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js @@ -113,62 +113,62 @@ return view.extend({ tabname = 'nfqws_params'; s.tab(tabname, _('NFQWS options')); - let add_delim = function() { - o = s.taboption(tabname, form.DummyValue, '_hr'); + let add_delim = function(sec) { + let o = sec.taboption(tabname, form.DummyValue, '_hr'); o.rawhtml = true; o.default = '
'; }; - let add_param = function(param, locname = null, rows = 10) { + let add_param = function(sec, param, locname = null, rows = 10) { if (!locname) locname = param; - o = s.taboption(tabname, form.Button, '_' + param + '_btn', locname); - o.onclick = () => new tools.longstrEditDialog('config', param, param, locname, rows).show(); - o.inputtitle = _('Edit'); - o.inputstyle = 'edit btn'; - o = s.taboption(tabname, form.DummyValue, '_' + param); - o.rawhtml = false; - o.cfgvalue = function(section_id) { - var name = uci.get(tools.appName, section_id, param); + let btn = sec.taboption(tabname, form.Button, '_' + param + '_btn', locname); + btn.inputtitle = _('Edit'); + btn.inputstyle = 'edit btn'; + let val = sec.taboption(tabname, form.DummyValue, '_' + param); + val.rawhtml = false; + val.cfgvalue = function(section_id) { + let name = uci.get(tools.appName, section_id, param); if (name == null || name == "") - name = ""; + name = ""; return name; }; - o.validate = function(section_id, value) { + val.validate = function(section_id, value) { if (!value) return ""; - return value; + return value.trim(); }; + btn.onclick = () => new tools.longstrEditDialog('config', param, param, locname, rows).show(); }; - add_delim(); - add_param('NFQWS_OPT_DESYNC'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_SUFFIX'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_HTTP'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_HTTP_SUFFIX'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_HTTPS'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_HTTPS_SUFFIX'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_HTTP6'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_HTTP6_SUFFIX'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_HTTPS6'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_HTTPS6_SUFFIX'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_QUIC'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_QUIC_SUFFIX'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_QUIC6'); - add_delim(); - add_param('NFQWS_OPT_DESYNC_QUIC6_SUFFIX'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_SUFFIX'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_HTTP'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_HTTP_SUFFIX'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_HTTPS'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_HTTPS_SUFFIX'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_HTTP6'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_HTTP6_SUFFIX'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_HTTPS6'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_HTTPS6_SUFFIX'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_QUIC'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_QUIC_SUFFIX'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_QUIC6'); + add_delim(s); + add_param(s, 'NFQWS_OPT_DESYNC_QUIC6_SUFFIX'); /* Blacklist settings */ diff --git a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js index fe19a8d..4a1c667 100644 --- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js +++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js @@ -308,8 +308,11 @@ return baseclass.extend({ uci.set('zapret', this.cfgsec, this.cfgparam, value); uci.save(); + let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam); + if (elem) { + elem.querySelector('div').textContent = value; + } ui.hideModal(); - //ui.refreshPage(); // TODO /* return uci.save() .then(L.bind(ui.changes.init, ui.changes))