liquid_feedback_frontend

changeset 543:8b6bc2958126

merge
author bsw
date Sun May 27 23:05:46 2012 +0200 (2012-05-27)
parents 62923420b7f8 7bcff48f70b7
children 9447ea555398
files .hgtags app/main/initiative/_show_voting.lua config/default.lua model/member.lua
line diff
     1.1 --- a/.hgtags	Tue May 22 03:05:00 2012 +0200
     1.2 +++ b/.hgtags	Sun May 27 23:05:46 2012 +0200
     1.3 @@ -38,6 +38,7 @@
     1.4  bfd8d88f72fcb511bc20126805a4a92d10c7ea7f beta31
     1.5  bf735d8095aa237e0283305fc0c37527572248e7 beta32
     1.6  4905d7d79486cee780b715a90dcd643e936b6a7a beta33
     1.7 +f7bc22fbf660bd8ac57a1d715d6faabc3e34ba7f beta35
     1.8  74f768a162e1d941158bde5a3e42bb8a71af5090 v2.beta1
     1.9  371e690018ea59317682bce44e7b3c33c70d129a v2.beta2
    1.10  3e9457cfc6b195fc72760b5b22981e2e7b9c84d8 v2.beta3
     2.1 --- a/app/main/initiative/_show_voting.lua	Tue May 22 03:05:00 2012 +0200
     2.2 +++ b/app/main/initiative/_show_voting.lua	Sun May 27 23:05:46 2012 +0200
     2.3 @@ -29,8 +29,8 @@
     2.4          :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id })
     2.5          :add_field("direct_voter.weight as voter_weight")
     2.6          :add_field("coalesce(vote.grade, 0) as grade")
     2.7 -        :join("initiative", nil, "initiative.id = vote.initiative_id")
     2.8 -        :join("issue", nil, "issue.id = initiative.issue_id")
     2.9 +        :left_join("initiative", nil, "initiative.id = vote.initiative_id")
    2.10 +        :left_join("issue", nil, "issue.id = initiative.issue_id")
    2.11      }
    2.12    }
    2.13  

Impressum / About Us