diff options
Diffstat (limited to 'modules/luci-mod-system')
| -rw-r--r-- | modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js | 17 | ||||
| -rw-r--r-- | modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua | 2 |
2 files changed, 12 insertions, 7 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 4a1058d0d9..3f28680389 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 @@ -385,16 +385,21 @@ return view.extend({ o.onclick = L.bind(this.handleRestore, this); - if (procmtd.length) { + var mtdblocks = []; + procmtd.split(/\n/).forEach(function(ln) { + var match = ln.match(/^mtd(\d+): .+ "(.+?)"$/); + if (match) + mtdblocks.push(match[1], match[2]); + }); + + if (mtdblocks.length) { o = s.option(form.SectionValue, 'actions', form.NamedSection, 'actions', 'actions', _('Save mtdblock contents'), _('Click "Save mtdblock" to download specified mtdblock file. (NOTE: THIS FEATURE IS FOR PROFESSIONALS! )')); ss = o.subsection; o = ss.option(form.ListValue, 'mtdselect', _('Choose mtdblock')); - procmtd.split(/\n/).forEach(function(ln) { - var match = ln.match(/^mtd(\d+): .+ "(.+?)"$/); - if (match) - o.value(match[1], match[2]); - }); + + for (var i = 0; i < mtdblocks.length; i += 2) + o.value(mtdblocks[i], mtdblocks[i+1]); o = ss.option(form.Button, 'mtddownload', _('Download mtdblock')); o.inputstyle = 'action important'; diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua index c81466c874..91c6549163 100644 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua +++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua @@ -68,7 +68,7 @@ else break else files[#files+1] = "<li>" - files[#files+1] = luci.util.pcdata(ln) + files[#files+1] = luci.xml.pcdata(ln) files[#files+1] = "</li>" end end |