# HG changeset patch
# User bsw
# Date 1340220708 -7200
# Node ID 6fc640d87c8fbde69bf8a90d9b68d6e4e47cea64
# Parent  edf6b6814a68cbf8c9af43cfdfe938b81af643d9
Made member administration more powerfull

diff -r edf6b6814a68 -r 6fc640d87c8f app/main/admin/_action/member_update.lua
--- a/app/main/admin/_action/member_update.lua	Wed Jun 20 21:31:14 2012 +0200
+++ b/app/main/admin/_action/member_update.lua	Wed Jun 20 21:31:48 2012 +0200
@@ -2,7 +2,20 @@
 
 local member = Member:by_id(id) or Member:new()
 
-param.update(member, "identification", "notify_email", "admin", "locked")
+param.update(member, "identification", "notify_email", "admin")
+
+local locked = param.get("locked", atom.boolean)
+if locked then
+  member.locked = locked
+end
+local login = param.get("login")
+if login then
+  member.login = login
+end
+local name = param.get("name")
+if name then
+  member.name = name
+end
 
 local err = member:try_save()
 
diff -r edf6b6814a68 -r 6fc640d87c8f app/main/admin/member_edit.lua
--- a/app/main/admin/member_edit.lua	Wed Jun 20 21:31:14 2012 +0200
+++ b/app/main/admin/member_edit.lua	Wed Jun 20 21:31:48 2012 +0200
@@ -35,7 +35,8 @@
   content = function()
     ui.field.text{     label = _"Identification", name = "identification" }
     ui.field.text{     label = _"Notification email", name = "notify_email" }
-    if member and member.login then
+    if member and member.activated then
+      ui.field.text{     label = _"Screen name",        name = "name" }
       ui.field.text{     label = _"Login name",        name = "login" }
     end
     ui.field.boolean{  label = _"Admin?",       name = "admin" }
@@ -55,7 +56,7 @@
       ui.field.boolean{  label = _"Send invite?",       name = "invite_member" }
     end
     
-    if member then
+    if member and member.activated then
       ui.field.boolean{  label = _"Lock member?",       name = "locked" }
     end
     
diff -r edf6b6814a68 -r 6fc640d87c8f app/main/admin/member_list.lua
--- a/app/main/admin/member_list.lua	Wed Jun 20 21:31:14 2012 +0200
+++ b/app/main/admin/member_list.lua	Wed Jun 20 21:31:48 2012 +0200
@@ -1,21 +1,7 @@
-local show_locked = param.get("show_locked", atom.boolean)
-
-local locked = show_locked or false
 local search = param.get("search")
-if search then
-  locked = nil
-end
-
-local members_selector = Member:build_selector{
-  admin_search = search,
-  locked = locked,
-  order = "identification"
-}
-
 
 ui.title(_"Member list")
 
-
 slot.select("head", function()
   ui.container{ attr = { class = "content" }, content = function()
     ui.container{ attr = { class = "actions" }, content = function()
@@ -25,23 +11,6 @@
         module = "admin",
         view = "member_edit"
       }
-      slot.put(" · ")
-      if show_locked then
-        ui.link{
-          attr = { class = { "admin_only" } },
-          text = _"Show active members",
-          module = "admin",
-          view = "member_list"
-        }
-      else
-        ui.link{
-          attr = { class = { "admin_only" } },
-          text = _"Show locked members",
-          module = "admin",
-          view = "member_list",
-          params = { show_locked = true }
-        }
-      end
     end }
   end }
 end)
@@ -58,6 +27,16 @@
   end
 }
 
+if not search then
+  return
+end
+
+local members_selector = Member:build_selector{
+  admin_search = search,
+  order = "identification"
+}
+
+
 ui.paginate{
   selector = members_selector,
   per_page = 30,
@@ -94,6 +73,8 @@
               ui.field.text{ value = "not activated" }
             elseif not record.active then
               ui.field.text{ value = "inactive" }
+            else
+              ui.field.text{ value = "active" }
             end
           end
         },