# HG changeset patch
# User bsw
# Date 1338152746 -7200
# Node ID 8b6bc29581260321affd738ba641aa68b59d386b
# Parent  62923420b7f86d7a1ca0dfe8853aa85f36abfec9# Parent  7bcff48f70b7795c484ab9a22758bad322db9515
merge

diff -r 62923420b7f8 -r 8b6bc2958126 .hgtags
--- a/.hgtags	Tue May 22 03:05:00 2012 +0200
+++ b/.hgtags	Sun May 27 23:05:46 2012 +0200
@@ -38,6 +38,7 @@
 bfd8d88f72fcb511bc20126805a4a92d10c7ea7f beta31
 bf735d8095aa237e0283305fc0c37527572248e7 beta32
 4905d7d79486cee780b715a90dcd643e936b6a7a beta33
+f7bc22fbf660bd8ac57a1d715d6faabc3e34ba7f beta35
 74f768a162e1d941158bde5a3e42bb8a71af5090 v2.beta1
 371e690018ea59317682bce44e7b3c33c70d129a v2.beta2
 3e9457cfc6b195fc72760b5b22981e2e7b9c84d8 v2.beta3
diff -r 62923420b7f8 -r 8b6bc2958126 app/main/initiative/_show_voting.lua
--- a/app/main/initiative/_show_voting.lua	Tue May 22 03:05:00 2012 +0200
+++ b/app/main/initiative/_show_voting.lua	Sun May 27 23:05:46 2012 +0200
@@ -29,8 +29,8 @@
         :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")
+        :left_join("initiative", nil, "initiative.id = vote.initiative_id")
+        :left_join("issue", nil, "issue.id = initiative.issue_id")
     }
   }
 
diff -r 62923420b7f8 -r 8b6bc2958126 config/default.lua
diff -r 62923420b7f8 -r 8b6bc2958126 model/member.lua