diff options
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_system/upgrade.htm | 3 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/controller/mini/system.lua | 4 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/upgrade.htm | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm index 03cd555c75..569a0bbd27 100644 --- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm @@ -36,6 +36,9 @@ $Id$ <% elseif ret then %> <p><%:a_s_flash_received%></p> <p><%:a_s_flash_inprogress%></p> + +<!-- <%=string.rep(" ", 2048)%> --> + <% %> <% local ret = ret() if ret == 0 then %> <div class="ok"><%:a_s_flash_flashed%></div> diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua index c3910a3020..265443bd32 100644 --- a/modules/admin-mini/luasrc/controller/mini/system.lua +++ b/modules/admin-mini/luasrc/controller/mini/system.lua @@ -105,7 +105,9 @@ function action_upgrade() local keepcfg = keep_avail and luci.http.formvalue("keepcfg") if plat and fname then - ret = luci.sys.flash(tmpfile, keepcfg and _keep_pattern()) + ret = function() + return luci.sys.flash(tmpfile, keepcfg and _keep_pattern()) + end end luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail}) diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm index e0fbb93326..569a0bbd27 100644 --- a/modules/admin-mini/luasrc/view/mini/upgrade.htm +++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm @@ -34,7 +34,13 @@ $Id$ </div> </form> <% elseif ret then %> - <% if ret == 0 then %> + <p><%:a_s_flash_received%></p> + <p><%:a_s_flash_inprogress%></p> + +<!-- <%=string.rep(" ", 2048)%> --> + <% %> + <% local ret = ret() + if ret == 0 then %> <div class="ok"><%:a_s_flash_flashed%></div> <% else %> <div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div> |