summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc/view
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-09-18 21:26:34 +0000
committerSteven Barth <steven@midlink.org>2008-09-18 21:26:34 +0000
commit8f5d0d6ff5a1cbb40eccce5eeb99d5249bab5159 (patch)
tree51d8e1650322090f60ba37ff4cf2baa19b5c5a0e /modules/admin-full/luasrc/view
parent5067e2d185bbd1fdf029a8da2a84895bbccfad02 (diff)
new sysupgrade fixes part 2
Diffstat (limited to 'modules/admin-full/luasrc/view')
-rw-r--r--modules/admin-full/luasrc/view/admin_system/upgrade.htm11
1 files changed, 8 insertions, 3 deletions
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 693022f323..8fe658a427 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -38,17 +38,22 @@ $Id$
<p><%:a_s_flash_received%></p>
<% reboot.exec = false
- for name, func in pairs(flash) do %>
+ for i, entry in ipairs(flash) do
+ local name, func = entry.name, entry.func %>
<%:a_s_flash_inprogress%> <%=name%>...
- <%=string.rep(" ", 2048)%>
+ <%=string.rep(" ", 32*1024)%>
<%
local stat, code = func()
reboot.exec = reboot.exec or stat
if stat and code then %>
- <%:a_s_flash_flashed%><br />
+ <%:ok%><br />
<% else %>
<%:a_s_flash_flasherr%>! (<%:code%> <%=code%>)<br />
<% end %>
+ <% if reboot.exec then %>
+ <br />
+ <div><%:a_s_flash_flashed%></div>
+ <% end %>
<% end %>
<% else %>
<div class="error"><%:a_s_flash_notimplemented%></div>