1.1 --- a/model/area.lua	Fri May 18 21:03:10 2012 +0200
     1.2 +++ b/model/area.lua	Sun May 20 19:43:01 2012 +0200
     1.3 @@ -80,7 +80,7 @@
     1.4      end
     1.5      sub_selector:from("area")
     1.6      sub_selector:add_field("area.id", "area_id")
     1.7 -    sub_selector:add_field{ '(delegation_info(?, null, area.id, null)).*', options.member_id }
     1.8 +    sub_selector:add_field{ '(delegation_info(?, null, area.id, null, ?)).*', options.member_id, options.trustee_id }
     1.9      sub_selector:add_where{ 'area.id IN ($)', ids }
    1.10  
    1.11      local selector = Area:get_db_conn():new_selector()
    1.12 @@ -94,9 +94,9 @@
    1.13    end
    1.14  }
    1.15  
    1.16 -function Area.list:load_delegation_info_once_for_member_id(member_id)
    1.17 +function Area.list:load_delegation_info_once_for_member_id(member_id, trustee_id)
    1.18    if self._delegation_info_loaded_for_member_id ~= member_id then
    1.19 -    self:load("delegation_info", { member_id = member_id })
    1.20 +    self:load("delegation_info", { member_id = member_id, trustee_id = trustee_id })
    1.21      for i, area in ipairs(self) do
    1.22        area._delegation_info_loaded_for_member_id = member_id
    1.23      end
    1.24 @@ -104,9 +104,9 @@
    1.25    end
    1.26  end
    1.27  
    1.28 -function Area.object:load_delegation_info_once_for_member_id(member_id)
    1.29 +function Area.object:load_delegation_info_once_for_member_id(member_id, trustee_id)
    1.30    if self._delegation_info_loaded_for_member_id ~= member_id then
    1.31 -    self:load("delegation_info", { member_id = member_id })
    1.32 +    self:load("delegation_info", { member_id = member_id, trustee_id = trustee_id })
    1.33      self._delegation_info_loaded_for_member_id = member_id
    1.34    end
    1.35  end