Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-01-31 06:40:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci: Fix restart service when pressed on Save&Apply or Restart buttons

Browse Source
This commit is contained in:
remittor
2026-01-27 13:52:28 +03:00
parent e0dbf3653d
commit 5860c9829a
4 changed files with 75 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js
View File

@@ -62,7 +62,9 @@ return view.extend({
});
},
setAppStatus: function(status_array, elems = { }, force_app_status = 0) {
setAppStatus: function(status_array, elems = { }, force_app_status = 0)
{
tools.execDefferedAction();
let cfg = uci.get(tools.appName, 'config');
if (!status_array || cfg == null || typeof(cfg) !== 'object') {
let elem_status = elems.status || document.getElementById("status");
@@ -141,6 +143,15 @@ return view.extend({
this.disableButtons(true, btn);
poll.stop();
try {
if (action == 'start' || action == 'restart') {
let apply_exec = tools.checkUnsavedChanges();
if (apply_exec) {
ui.changes.apply(true); // apply_rollback
await new Promise(resolve => setTimeout(resolve, 1000));
tools.setDefferedAction(action, null, true);
return;
}
}
await tools.serviceActionEx(action, args, false);
if (hide_modal) {
ui.hideModal();
@@ -148,13 +159,14 @@ return view.extend({
} catch(e) {
//ui.addNotification(null, E('p', 'Error: ' + e.message));
} finally {
if (btn && btn_dis) {
setTimeout(() => { btn.disabled = true; }, 0);
}
if (!poll.active()) {
await new Promise(resolve => setTimeout(resolve, 10));
poll.start();
}
setTimeout(() => {
if (btn && btn_dis) {
btn.disabled = true;
}
if (!poll.active()) {
poll.start();
}
}, 0);
}
},
@@ -285,8 +297,6 @@ return view.extend({
}
let cfg = uci.get(tools.appName, 'config');
tools.checkAndRestartSvc(status_array[2]); // svc_info
let pkgdict = status_array[4];
if (pkgdict == null) {
ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': render()'));