1.1 --- a/app/main/admin/member_list.lua	Mon Nov 08 02:39:30 2010 +0100
     1.2 +++ b/app/main/admin/member_list.lua	Mon Nov 08 15:04:44 2010 +0100
     1.3 @@ -1,5 +1,14 @@
     1.4 +local show_locked = param.get("show_locked", atom.boolean)
     1.5 +
     1.6 +local members_selector = Member:build_selector{ 
     1.7 +  active = not show_locked,
     1.8 +  order = "login"
     1.9 +}
    1.10 +
    1.11 +
    1.12  slot.put_into("title", _"Member list")
    1.13  
    1.14 +
    1.15  slot.select("actions", function()
    1.16    ui.link{
    1.17      attr = { class = { "admin_only" } },
    1.18 @@ -7,7 +16,7 @@
    1.19      module = "admin",
    1.20      view = "member_edit"
    1.21    }
    1.22 -  if param.get("show_locked") then
    1.23 +  if show_locked then
    1.24      ui.link{
    1.25        attr = { class = { "admin_only" } },
    1.26        text = _"Show active members",
    1.27 @@ -25,20 +34,10 @@
    1.28    end
    1.29  end)
    1.30  
    1.31 -local members_selector
    1.32 -
    1.33 -if param.get("show_locked", atom.boolean) then
    1.34 -  members_selector = Member:new_selector()
    1.35 -    :add_where("not active")
    1.36 -    :add_order_by("login")
    1.37 -else
    1.38 -  members_selector = Member:new_selector()
    1.39 -    :add_where("active")
    1.40 -    :add_order_by("login")
    1.41 -end
    1.42  
    1.43  ui.paginate{
    1.44    selector = members_selector,
    1.45 +  per_page = 30,
    1.46    content = function() 
    1.47      ui.list{
    1.48        records = members_selector:exec(),
    1.49 @@ -68,22 +67,20 @@
    1.50          },
    1.51          {
    1.52            content = function(record)
    1.53 -            if app.session.member.admin and not record.active then
    1.54 +            if not record.active then
    1.55                ui.field.text{ value = "locked" }
    1.56              end
    1.57            end
    1.58          },
    1.59          {
    1.60            content = function(record)
    1.61 -            if app.session.member.admin then
    1.62 -              ui.link{
    1.63 -                attr = { class = "action admin_only" },
    1.64 -                text = _"Edit",
    1.65 -                module = "admin",
    1.66 -                view = "member_edit",
    1.67 -                id = record.id
    1.68 -              }
    1.69 -            end
    1.70 +            ui.link{
    1.71 +              attr = { class = "action admin_only" },
    1.72 +              text = _"Edit",
    1.73 +              module = "admin",
    1.74 +              view = "member_edit",
    1.75 +              id = record.id
    1.76 +            }
    1.77            end
    1.78          }
    1.79        }