X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-mini%2Fluasrc%2Fview%2Fmini%2Fupgrade.htm;h=40f3ec984415e1f0807f9fef74e2ee181d65aaf4;hp=a3d97d6497c5872fb051fe4b2187ef3837e4d4b5;hb=fade8edd2dfe39ae579256d04220aba9da2ff074;hpb=e0cfb49235b5890b24dbfcafeb5c7805327d6403

diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm
index a3d97d649..40f3ec984 100644
--- a/modules/admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm
@@ -17,7 +17,7 @@ $Id$
 <h2><%:a_s_flash%></h2>
 <p><%:a_s_flash_upgrade1%></p>
 <br />
-<% if sysupgrade and not ret then %>
+<% if sysupgrade and ret == nil then %>
 <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
 	<div class="left"><%:a_s_flash_fwimage%>:</div>
 	<div>
@@ -33,20 +33,14 @@ $Id$
 		<input type="submit" value="<%:a_s_flash_fwupgrade%>" />
 	</div>
 </form>
-<% 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>
+<% elseif ret ~= nil then %>
+	<% if ret then %>
+<p><%:a_s_flash_received%></p>
+<p><%:a_s_flash_inprogress%></p>
 	<% else %>
-<div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div>	
+<div class="error"><%:a_s_flash_flasherr%>! (<%=err%>)</div>	
 	<% end %>
 <% else %>
 <div class="error"><%:a_s_flash_notimplemented%></div>
 <% end %>
 <%+footer%>
-<% if ret == 0 then luci.sys.reboot() end %>