From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 7 Oct 2019 17:55:31 +0000 (+0200)
Subject: luci-mod-system: flash.js: fix passing sysupgrade opts
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5ccbda54e810f51d7ab343815c6b80928eecfcbd;p=oweals%2Fluci.git

luci-mod-system: flash.js: fix passing sysupgrade opts

Instead of binding the checked state to the button handler function,
bind the underlying checkboxes instead to observe the actual user
choice instead of the initial value.

This fixes forcing sysupgrade or deselecting keep settings.

Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
index 915c3c7fa..61e021c28 100644
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js
@@ -342,7 +342,7 @@ return L.view.extend({
 
 				var cntbtn = E('button', {
 					'class': 'btn cbi-button-action important',
-					'click': L.ui.createHandlerFn(this, 'handleSysupgradeConfirm', btn, keep.checked, force.checked),
+					'click': L.ui.createHandlerFn(this, 'handleSysupgradeConfirm', btn, keep, force),
 					'disabled': (!is_valid || is_too_big) ? true : null
 				}, [ _('Continue') ]);
 
@@ -376,10 +376,10 @@ return L.view.extend({
 
 		var opts = [];
 
-		if (!keep)
+		if (!keep.checked)
 			opts.push('-n');
 
-		if (force)
+		if (force.checked)
 			opts.push('--force');
 
 		opts.push('/tmp/firmware.bin');