1.1 --- a/app/main/admin/member_list.lua	Wed Jun 20 21:31:14 2012 +0200
     1.2 +++ b/app/main/admin/member_list.lua	Wed Jun 20 21:31:48 2012 +0200
     1.3 @@ -1,21 +1,7 @@
     1.4 -local show_locked = param.get("show_locked", atom.boolean)
     1.5 -
     1.6 -local locked = show_locked or false
     1.7  local search = param.get("search")
     1.8 -if search then
     1.9 -  locked = nil
    1.10 -end
    1.11 -
    1.12 -local members_selector = Member:build_selector{
    1.13 -  admin_search = search,
    1.14 -  locked = locked,
    1.15 -  order = "identification"
    1.16 -}
    1.17 -
    1.18  
    1.19  ui.title(_"Member list")
    1.20  
    1.21 -
    1.22  slot.select("head", function()
    1.23    ui.container{ attr = { class = "content" }, content = function()
    1.24      ui.container{ attr = { class = "actions" }, content = function()
    1.25 @@ -25,23 +11,6 @@
    1.26          module = "admin",
    1.27          view = "member_edit"
    1.28        }
    1.29 -      slot.put(" · ")
    1.30 -      if show_locked then
    1.31 -        ui.link{
    1.32 -          attr = { class = { "admin_only" } },
    1.33 -          text = _"Show active members",
    1.34 -          module = "admin",
    1.35 -          view = "member_list"
    1.36 -        }
    1.37 -      else
    1.38 -        ui.link{
    1.39 -          attr = { class = { "admin_only" } },
    1.40 -          text = _"Show locked members",
    1.41 -          module = "admin",
    1.42 -          view = "member_list",
    1.43 -          params = { show_locked = true }
    1.44 -        }
    1.45 -      end
    1.46      end }
    1.47    end }
    1.48  end)
    1.49 @@ -58,6 +27,16 @@
    1.50    end
    1.51  }
    1.52  
    1.53 +if not search then
    1.54 +  return
    1.55 +end
    1.56 +
    1.57 +local members_selector = Member:build_selector{
    1.58 +  admin_search = search,
    1.59 +  order = "identification"
    1.60 +}
    1.61 +
    1.62 +
    1.63  ui.paginate{
    1.64    selector = members_selector,
    1.65    per_page = 30,
    1.66 @@ -94,6 +73,8 @@
    1.67                ui.field.text{ value = "not activated" }
    1.68              elseif not record.active then
    1.69                ui.field.text{ value = "inactive" }
    1.70 +            else
    1.71 +              ui.field.text{ value = "active" }
    1.72              end
    1.73            end
    1.74          },