summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc/view
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-09-12 16:12:23 +0000
committerSteven Barth <steven@midlink.org>2008-09-12 16:12:23 +0000
commit2bbc4eb3c33c3590433174c599ec9418bdb8f38a (patch)
treeec483f9e199ae9193aabc7c3cfeec390accbc7d7 /modules/admin-full/luasrc/view
parent65b0a2bfad5f24b851a14ab0a405e60f24321bdf (diff)
Revert "Redesigned firmware upgrade process"
Diffstat (limited to 'modules/admin-full/luasrc/view')
-rw-r--r--modules/admin-full/luasrc/view/admin_system/upgrade.htm18
1 files changed, 12 insertions, 6 deletions
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 40f3ec9844..a3d97d6497 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -17,7 +17,7 @@ $Id$
<h2><%:a_s_flash%></h2>
<p><%:a_s_flash_upgrade1%></p>
<br />
-<% if sysupgrade and ret == nil then %>
+<% if sysupgrade and not ret then %>
<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
<div class="left"><%:a_s_flash_fwimage%>:</div>
<div>
@@ -33,14 +33,20 @@ $Id$
<input type="submit" value="<%:a_s_flash_fwupgrade%>" />
</div>
</form>
-<% elseif ret ~= nil then %>
- <% if ret then %>
-<p><%:a_s_flash_received%></p>
-<p><%:a_s_flash_inprogress%></p>
+<% 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>
<% else %>
-<div class="error"><%:a_s_flash_flasherr%>! (<%=err%>)</div>
+<div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div>
<% end %>
<% else %>
<div class="error"><%:a_s_flash_notimplemented%></div>
<% end %>
<%+footer%>
+<% if ret == 0 then luci.sys.reboot() end %>