X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_system%2Fpasswd.lua;h=6f13bb0fc8ac66dd0088ca5b99d4f931a88eb834;hb=7c765875884d6866c53b63757731b079bace2e9b;hp=7e766d5ebd17780e2167c98f6ddbb58cd6340016;hpb=15e2e16c6d81633d0dede30e7411e6b224998029;p=project%2Fluci.git

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua b/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
index 7e766d5ebd..6f13bb0fc8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
@@ -12,13 +12,15 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-f = SimpleForm("password", translate("a_s_changepw"), translate("a_s_changepw1"))
+f = SimpleForm("password", translate("Admin Password"), translate("Change the password of the system administrator (User <code>root</code>)"))
 
-pw1 = f:field(Value, "pw1", translate("password"))
+pw1 = f:field(Value, "pw1", translate("Password"))
 pw1.password = true
+pw1.rmempty = false
 
-pw2 = f:field(Value, "pw2", translate("confirmation"))
+pw2 = f:field(Value, "pw2", translate("Confirmation"))
 pw2.password = true
+pw2.rmempty = false
 
 function pw2.validate(self, value, section)
 	return pw1:formvalue(section) == value and value
@@ -27,16 +29,15 @@ end
 function f.handle(self, state, data)
 	if state == FORM_VALID then
 		local stat = luci.sys.user.setpasswd("root", data.pw1) == 0
-		local x = f:field(DummyValue, "_stat")
 		
 		if stat then
-			x.value = translate("a_s_changepw_changed")
+			f.message = translate("Password successfully changed")
 		else
-			x.value = translate("unknownerror")
+			f.errmessage = translate("Unknown Error")
 		end
 		
-		pw1.render = function() end
-		pw2.render = pw1.render
+		data.pw1 = nil
+		data.pw2 = nil
 	end
 	return true
 end