# HG changeset patch
# User bsw
# Date 1325210783 -3600
# Node ID df2d7ba9cc9b7af04d54d96fc8cd98c0bcbbcc95
# Parent  ec86db5063126a1e978de9e8803e187cb11ca74f
Changed field active to activated in admin member frontend (according to change in core-2)

diff -r ec86db506312 -r df2d7ba9cc9b app/main/admin/_action/member_update.lua
--- a/app/main/admin/_action/member_update.lua	Fri Dec 30 03:04:17 2011 +0100
+++ b/app/main/admin/_action/member_update.lua	Fri Dec 30 03:06:23 2011 +0100
@@ -1,6 +1,10 @@
 local member = Member:by_id(param.get_id()) or Member:new()
 
-param.update(member, "login", "admin", "name", "active")
+param.update(member, "login", "admin", "name")
+
+if param.get("activated", atom.boolean) then
+  member.activated = "now"
+end
 
 local password = param.get("password")
 if password == "********" or #password == 0 then
@@ -22,4 +26,4 @@
   else
     slot.put_into("notice", _"Member successfully registered")
   end
-end
\ No newline at end of file
+end
diff -r ec86db506312 -r df2d7ba9cc9b app/main/admin/member_edit.lua
--- a/app/main/admin/member_edit.lua	Fri Dec 30 03:04:17 2011 +0100
+++ b/app/main/admin/member_edit.lua	Fri Dec 30 03:06:23 2011 +0100
@@ -27,7 +27,7 @@
     ui.field.text{     label = _"Name",         name = "name" }
     ui.field.password{ label = _"Password",     name = "password", value = (member and member.password) and "********" or "" }
     ui.field.boolean{  label = _"Admin?",       name = "admin" }
-    ui.field.boolean{  label = _"Active?",      name = "active" }
+    ui.field.boolean{  label = _"Activated?",   name = "activated" }
     ui.submit{         text  = _"Save" }
   end
 }