1.1 --- a/app/main/delegation/show.lua	Tue Jun 19 21:33:11 2012 +0200
     1.2 +++ b/app/main/delegation/show.lua	Tue Jun 19 22:39:57 2012 +0200
     1.3 @@ -10,7 +10,7 @@
     1.4      current_trustee_id = unit.delegation_info.first_trustee_id
     1.5      current_trustee_name = unit.delegation_info.first_trustee_name
     1.6    end
     1.7 -  slot.put_into("title", encode.html(config.single_unit_id and _"Set global delegation" or _"Set unit delegation"))
     1.8 +  ui.title(config.single_unit_id and _"Set global delegation" or _"Set unit delegation")
     1.9    util.help("delegation.new.unit")
    1.10  end
    1.11  
    1.12 @@ -18,7 +18,11 @@
    1.13  if area then
    1.14    area:load_delegation_info_once_for_member_id(app.session.member_id)
    1.15    voting_right_unit_id = area.unit_id
    1.16 -  slot.put_into("title", encode.html(_"Set delegation for Area '#{name}'":gsub("#{name}", area.name)))
    1.17 +  if area.delegation_info.own_delegation_scope == 'area' then
    1.18 +    current_trustee_id = area.delegation_info.first_trustee_id
    1.19 +    current_trustee_name = area.delegation_info.first_trustee_name
    1.20 +  end
    1.21 +  ui.title(_"Set delegation for Area '#{name}'":gsub("#{name}", area.name))
    1.22    util.help("delegation.new.area")
    1.23  end
    1.24  
    1.25 @@ -26,7 +30,11 @@
    1.26  if issue then
    1.27    issue:load("member_info", { member_id = app.session.member_id })
    1.28    voting_right_unit_id = issue.area.unit_id
    1.29 -  slot.put_into("title", encode.html(_"Set delegation for Issue ##{number} in Area '#{area_name}'":gsub("#{number}", issue.id):gsub("#{area_name}", issue.area.name)))
    1.30 +  if issue.member_info.own_delegation_scope == 'issue' then
    1.31 +    current_trustee_id = issue.member_info.first_trustee_id
    1.32 +    current_trustee_name = issue.member_info.first_trustee_name
    1.33 +  end
    1.34 +  ui.title(_"Set delegation for Issue ##{number} in Area '#{area_name}'":gsub("#{number}", issue.id):gsub("#{area_name}", issue.area.name))
    1.35    util.help("delegation.new.issue")
    1.36  end
    1.37