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:
087bd8a
)
Fixed stupid bug
author
Steven Barth
<steven@midlink.org>
Sat, 6 Sep 2008 19:39:03 +0000
(19:39 +0000)
committer
Steven Barth
<steven@midlink.org>
Sat, 6 Sep 2008 19:39:03 +0000
(19:39 +0000)
modules/admin-full/luasrc/controller/admin/system.lua
patch
|
blob
|
history
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/controller/admin/system.lua
b/modules/admin-full/luasrc/controller/admin/system.lua
index
b72b3a7
..
5d64336
100644
(file)
--- a/
modules/admin-full/luasrc/controller/admin/system.lua
+++ b/
modules/admin-full/luasrc/controller/admin/system.lua
@@
-214,7
+214,6
@@
function action_upgrade()
end
luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
end
luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
- luci.sys.reboot()
end
function _keep_pattern()
end
function _keep_pattern()
diff --git
a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index
569a0bb
..
a3d97d6
100644
(file)
--- a/
modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/
modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@
-48,4
+48,5
@@
$Id$
<% else %>
<div class="error"><%:a_s_flash_notimplemented%></div>
<% end %>
<% else %>
<div class="error"><%:a_s_flash_notimplemented%></div>
<% end %>
-<%+footer%>
\ No newline at end of file
+<%+footer%>
+<% if ret == 0 then luci.sys.reboot() end %>
diff --git
a/modules/admin-mini/luasrc/controller/mini/system.lua
b/modules/admin-mini/luasrc/controller/mini/system.lua
index
149cd58
..
6d16ef8
100644
(file)
--- a/
modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/
modules/admin-mini/luasrc/controller/mini/system.lua
@@
-111,7
+111,6
@@
function action_upgrade()
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})
- luci.sys.reboot()
end
function _keep_pattern()
end
function _keep_pattern()
diff --git
a/modules/admin-mini/luasrc/view/mini/upgrade.htm
b/modules/admin-mini/luasrc/view/mini/upgrade.htm
index
569a0bb
..
a3d97d6
100644
(file)
--- a/
modules/admin-mini/luasrc/view/mini/upgrade.htm
+++ b/
modules/admin-mini/luasrc/view/mini/upgrade.htm
@@
-48,4
+48,5
@@
$Id$
<% else %>
<div class="error"><%:a_s_flash_notimplemented%></div>
<% end %>
<% else %>
<div class="error"><%:a_s_flash_notimplemented%></div>
<% end %>
-<%+footer%>
\ No newline at end of file
+<%+footer%>
+<% if ret == 0 then luci.sys.reboot() end %>