summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-12-07 13:26:34 +0000
committerSteven Barth <steven@midlink.org>2008-12-07 13:26:34 +0000
commit596084109819606afa5e05a42b7c8757f96f8689 (patch)
treeeb4cb1abed4c10a0133bffb4bdd417604765d64e /modules
parent506822ee7080e86584a4f6436aeeb8edb411c88e (diff)
System Password: Prevent error when both password fields are empty
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua2
-rw-r--r--modules/admin-mini/luasrc/model/cbi/mini/passwd.lua2
2 files changed, 4 insertions, 0 deletions
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 8ff18cb5c..dff5aeb7b 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
@@ -16,9 +16,11 @@ f = SimpleForm("password", translate("a_s_changepw"), translate("a_s_changepw1")
pw1 = f:field(Value, "pw1", translate("password"))
pw1.password = true
+pw1.rmempty = false
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
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua b/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
index 8ff18cb5c..dff5aeb7b 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
@@ -16,9 +16,11 @@ f = SimpleForm("password", translate("a_s_changepw"), translate("a_s_changepw1")
pw1 = f:field(Value, "pw1", translate("password"))
pw1.password = true
+pw1.rmempty = false
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