Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-sqm: only reload view once sqm enable/start completed

Browse source 
Chain the exec calls to enable and start the SQM service and only reload
the view once these operations are complete and return the entire promise
chain from the handler function to ensure that the busy indicator remains
active throughout the entire duration of the operation.

Also replace exec_direct() with exec() as there is no need to bypass ubus
for the init script calls.

Fixes: e76d9cc767 ("luci-app-sqm: fix JS error if service is disabled")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 005c09a293)
This commit is contained in:
Jo-Philipp Wich 2021-06-13 08:57:27 +02:00
parent 0d45661369
commit f161b40e4c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
applications/luci-app-sqm/htdocs/luci-static/resources/view/network/sqm.js
View file

@ -43,15 +43,17 @@ return view.extend({
scripts = data[1];
if (qdiscs.length === 0) {
ui.addNotification(null,
ui.addNotification(null,
E('div', { 'class': 'left' }, [
E('p', _("The SQM service seems to be disabled. Please use the button below to activate this service.")),
E('button', {
'class': 'btn cbi-button-active',
'click': ui.createHandlerFn(this, function() {
fs.exec_direct('/etc/init.d/sqm', ['enable']);
fs.exec_direct('/etc/init.d/sqm', ['start']);
location.reload();
return fs.exec('/etc/init.d/sqm', ['enable']).then(function() {
return fs.exec('/etc/init.d/sqm', ['start']);
}).then(function() {
location.reload();
});
})
}, _('Enable SQM'))
]));
@ -223,4 +225,4 @@ return view.extend({
return m.render();
}
})
})