# HG changeset patch
# User bsw
# Date 1289180283 -3600
# Node ID 256d9be759169c3ae27a4fd0c65c16752a3e01a4
# Parent  94075385f7ab040c0919fce00b1cda35eccfac25
Fixing highlighting of delegated member weight usage for votes.

diff -r 94075385f7ab -r 256d9be75916 app/main/initiative/_show_voting.lua
--- a/app/main/initiative/_show_voting.lua	Mon Nov 08 01:44:05 2010 +0100
+++ b/app/main/initiative/_show_voting.lua	Mon Nov 08 02:38:03 2010 +0100
@@ -22,10 +22,13 @@
     view = "_list",
     params = {
       initiative = initiative,
+      for_votes = true,
       members_selector =  initiative.issue:get_reference_selector("direct_voters")
         :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id })
         :add_field("direct_voter.weight as voter_weight")
         :add_field("coalesce(vote.grade, 0) as grade")
+        :join("initiative", nil, "initiative.id = vote.initiative_id")
+        :join("issue", nil, "issue.id = initiative.issue_id")
     }
   }
 
diff -r 94075385f7ab -r 256d9be75916 app/main/member/_list.lua
--- a/app/main/member/_list.lua	Mon Nov 08 01:44:05 2010 +0100
+++ b/app/main/member/_list.lua	Mon Nov 08 02:38:03 2010 +0100
@@ -3,11 +3,16 @@
 local issue = param.get("issue", "table")
 local trustee = param.get("trustee", "table")
 local initiator = param.get("initiator", "table")
-
+local for_votes = param.get("for_votes", atom.boolean)
 
 if initiative or issue then
-  members_selector:left_join("delegating_interest_snapshot", "_member_list__delegating_interest", { "_member_list__delegating_interest.event = issue.latest_snapshot_event AND _member_list__delegating_interest.issue_id = issue.id AND _member_list__delegating_interest.member_id = ?", app.session.member_id })
-  members_selector:add_field("_member_list__delegating_interest.delegate_member_ids", "delegate_member_ids")
+  if for_votes then
+    members_selector:left_join("delegating_voter", "_member_list__delegating_voter", { "_member_list__delegating_voter.issue_id = issue.id AND _member_list__delegating_voter.member_id = ?", app.session.member_id })
+    members_selector:add_field("_member_list__delegating_voter.delegate_member_ids", "delegate_member_ids")
+  else
+    members_selector:left_join("delegating_interest_snapshot", "_member_list__delegating_interest", { "_member_list__delegating_interest.event = issue.latest_snapshot_event AND _member_list__delegating_interest.issue_id = issue.id AND _member_list__delegating_interest.member_id = ?", app.session.member_id })
+    members_selector:add_field("_member_list__delegating_interest.delegate_member_ids", "delegate_member_ids")
+  end
 end
 
 ui.add_partial_param_names{ "member_list" }
diff -r 94075385f7ab -r 256d9be75916 app/main/vote/show_incoming.lua
--- a/app/main/vote/show_incoming.lua	Mon Nov 08 01:44:05 2010 +0100
+++ b/app/main/vote/show_incoming.lua	Mon Nov 08 02:38:03 2010 +0100
@@ -7,6 +7,7 @@
   :add_where{ "delegating_voter.issue_id = ?", issue.id }
   :add_where{ "delegating_voter.delegate_member_ids[1] = ?", member.id }
   :add_field("delegating_voter.weight", "voter_weight")
+  :join("issue", nil, "issue.id = delegating_voter.issue_id")
 
 execute.view{
   module = "member",