1.1 --- a/model/member.lua	Wed Jun 20 13:30:47 2012 +0200
     1.2 +++ b/model/member.lua	Wed Jun 20 13:31:09 2012 +0200
     1.3 @@ -241,6 +241,9 @@
     1.4    if args.active ~= nil then
     1.5      selector:add_where{ "member.active = ?", args.active }
     1.6    end
     1.7 +  if args.locked ~= nil then
     1.8 +    selector:add_where{ "member.locked = ?", args.locked }
     1.9 +  end
    1.10    if args.is_contact_of_member_id then
    1.11      selector:join("contact", "__model_member__contact", "member.id = __model_member__contact.other_member_id")
    1.12      selector:add_where{ "__model_member__contact.member_id = ?", args.is_contact_of_member_id }
    1.13 @@ -248,11 +251,15 @@
    1.14    if args.voting_right_for_unit_id then
    1.15      selector:join("privilege", "__model_member__privilege", { "member.id = __model_member__privilege.member_id AND __model_member__privilege.voting_right AND __model_member__privilege.unit_id = ?", args.voting_right_for_unit_id })
    1.16    end
    1.17 +  if args.admin_search then
    1.18 +    local search_string = "%" .. args.admin_search .. "%"
    1.19 +    selector:add_where{ "member.identification ILIKE ? OR member.name ILIKE ?", search_string, search_string }
    1.20 +  end
    1.21    if args.order then
    1.22      if args.order == "id" then
    1.23        selector:add_order_by("id")
    1.24 -    elseif args.order == "login" then
    1.25 -      selector:add_order_by("login")
    1.26 +    elseif args.order == "identification" then
    1.27 +      selector:add_order_by("identification")
    1.28      elseif args.order == "name" then
    1.29        selector:add_order_by("name")
    1.30      else