1.1 --- a/app/main/delegation/new.lua	Mon Nov 08 15:41:14 2010 +0100
     1.2 +++ b/app/main/delegation/new.lua	Mon Nov 08 15:49:23 2010 +0100
     1.3 @@ -51,13 +51,10 @@
     1.4  end)
     1.5  
     1.6  
     1.7 -
     1.8 -local contact_members = Member:new_selector()
     1.9 -  :add_where{ "contact.member_id = ?", app.session.member.id }
    1.10 -  :join("contact", nil, "member.id = contact.other_member_id")
    1.11 -  :add_order_by("member.name")
    1.12 -  :exec()
    1.13 -
    1.14 +local contact_members = Member:build_selector{
    1.15 +  is_contact_of_member_id = app.session.member_id,
    1.16 +  order = "name"
    1.17 +}:exec()
    1.18  
    1.19  ui.form{
    1.20    attr = { class = "vertical" },

     2.1 --- a/model/member.lua	Mon Nov 08 15:41:14 2010 +0100
     2.2 +++ b/model/member.lua	Mon Nov 08 15:49:23 2010 +0100
     2.3 @@ -223,11 +223,19 @@
     2.4    ref                   = 'supported_initiatives'
     2.5  }
     2.6  
     2.7 +Member:new_selector()
     2.8 +  :add_order_by("member.name")
     2.9 +  :exec()
    2.10 +
    2.11  function Member:build_selector(args)
    2.12    local selector = self:new_selector()
    2.13    if args.active ~= nil then
    2.14      selector:add_where{ "member.active = ?", args.active }
    2.15    end
    2.16 +  if args.is_contact_of_member_id then
    2.17 +    selector:join("contact", "__model_member__contact", "member.id = __model_member__contact.other_member_id")
    2.18 +    selector:add_where{ "__model_member__contact.member_id = ?", args.is_contact_of_member_id }
    2.19 +  end
    2.20    if args.order then
    2.21      if args.order == "id" then
    2.22        selector:add_order_by("id")