From 82035eec6150fef1319e6fcec324124f82ada754 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Wed, 18 Aug 2021 11:42:30 +0200 Subject: [PATCH] luci-mod-system: hide unsupported option on flash.js Hide unsupported option when /rom is not used in flash.js Signed-off-by: Ansuel Smith --- .../luci-static/resources/view/system/flash.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 82ab28e03d..8661181781 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 @@ -187,7 +187,7 @@ return view.extend({ form.parentNode.removeChild(form); }, - handleSysupgrade: function(storage_size, ev) { + handleSysupgrade: function(storage_size, has_rootfs_data, ev) { return ui.uploadFile('/tmp/firmware.bin', ev.target.firstChild) .then(L.bind(function(btn, reply) { btn.firstChild.data = _('Checking image…'); @@ -252,9 +252,11 @@ return view.extend({ } else { opts.keep[0].checked = true; - body.push(E('p', {}, E('label', { 'class': 'btn' }, [ - opts.skip_orig[0], ' ', _('Skip from backup files that are equal to those in /rom') - ]))); + if (has_rootfs_data) { + body.push(E('p', {}, E('label', { 'class': 'btn' }, [ + opts.skip_orig[0], ' ', _('Skip from backup files that are equal to those in /rom') + ]))); + } body.push(E('p', {}, E('label', { 'class': 'btn' }, [ opts.backup_pkgs[0], ' ', _('Include in backup a list of current installed packages at /etc/backup/installed_packages.txt') @@ -445,7 +447,7 @@ return view.extend({ o = ss.option(form.Button, 'sysupgrade', _('Image')); o.inputstyle = 'action important'; o.inputtitle = _('Flash image...'); - o.onclick = L.bind(this.handleSysupgrade, this, storage_size); + o.onclick = L.bind(this.handleSysupgrade, this, storage_size, has_rootfs_data); } -- 2.30.2