1.1 --- a/model/area.lua	Mon Mar 07 12:15:22 2011 +0100
     1.2 +++ b/model/area.lua	Sat Mar 12 19:22:50 2011 +0100
     1.3 @@ -29,6 +29,14 @@
     1.4  }
     1.5  
     1.6  Area:add_reference{
     1.7 +  mode          = 'm1',
     1.8 +  to            = "Unit",
     1.9 +  this_key      = 'unit_id',
    1.10 +  that_key      = 'id',
    1.11 +  ref           = 'unit',
    1.12 +}
    1.13 +
    1.14 +Area:add_reference{
    1.15    mode                  = 'mm',
    1.16    to                    = "Member",
    1.17    this_key              = 'id',
    1.18 @@ -95,6 +103,9 @@
    1.19    if args.active ~= nil then
    1.20      selector:add_where{ "active = ?", args.active }
    1.21    end
    1.22 +  if args.unit_id then
    1.23 +    selector:add_where{ "unit_id = ?", args.unit_id }
    1.24 +  end
    1.25    if args.member_id then
    1.26      selector:join("membership", nil, { "membership.area_id = area.id AND membership.member_id = ?", args.member_id })
    1.27    end
    1.28 @@ -102,5 +113,8 @@
    1.29      selector:left_join("membership", nil, { "membership.area_id = area.id AND membership.member_id = ?", args.not_member_id })
    1.30      selector:add_where{ "membership.member_id ISNULL" }
    1.31    end
    1.32 +  if args.order == "name" then
    1.33 +    selector:add_order_by("area.name")
    1.34 +  end
    1.35    return selector
    1.36  end