projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f61bd1a
)
Fixed responsiveness for flashing process
author
Steven Barth
<steven@midlink.org>
Sat, 6 Sep 2008 15:59:18 +0000
(15:59 +0000)
committer
Steven Barth
<steven@midlink.org>
Sat, 6 Sep 2008 15:59:18 +0000
(15:59 +0000)
modules/admin-full/luasrc/view/admin_system/upgrade.htm
patch
|
blob
|
history
modules/admin-mini/luasrc/controller/mini/system.lua
patch
|
blob
|
history
modules/admin-mini/luasrc/view/mini/upgrade.htm
patch
|
blob
|
history
diff --git
a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index
03cd555
..
569a0bb
100644
(file)
--- 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>
<% 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>
<% 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
c3910a3
..
265443b
100644
(file)
--- 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
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})
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
e0fbb93
..
569a0bb
100644
(file)
--- 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 %>
</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>
<div class="ok"><%:a_s_flash_flashed%></div>
<% else %>
<div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div>