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

luci-mod-system: flash.js: fix flash erase modal

Browse source 
The firstboot rpc call might not return, therefor do not wait on promise
fullfillment but display modal dialog right away.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-11-01 12:42:48 +01:00
parent b4861da886
commit 7d84396471
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
View file

@ -89,16 +89,14 @@ return L.view.extend({
if (!confirm(_('Do you really want to erase all settings?')))
return;
return fs.exec('/sbin/firstboot', [ '-r', '-y' ]).then(function(res) {
if (res.code != 0)
return L.ui.addNotification(null, E('p', _('The firstboot command failed with code %d').format(res.code)));
L.ui.showModal(_('Erasing...'), [
E('p', { 'class': 'spinning' }, _('The system is erasing the configuration partition now and will reboot itself when finished.'))
]);
L.ui.showModal(_('Erasing...'), [
E('p', { 'class': 'spinning' }, _('The system is erasing the configuration partition now and will reboot itself when finished.'))
]);
/* Currently the sysupgrade rpc call will not return, hence no promise handling */
fs.exec('/sbin/firstboot', [ '-r', '-y' ]);
L.ui.awaitReconnect('192.168.1.1', 'openwrt.lan');
}).catch(function(e) { L.ui.addNotification(null, E('p', e.message)) });
L.ui.awaitReconnect('192.168.1.1', 'openwrt.lan');
},
handleRestore: function(ev) {