liquid_feedback_frontend
changeset 854:8b856ffeec2d
Filter for delegated voting only if issue is closed
author | bsw |
---|---|
date | Fri Aug 17 00:30:19 2012 +0200 (2012-08-17) |
parents | 350218637753 |
children | 3178c97d2bcc |
files | app/main/issue/_filters.lua |
line diff
1.1 --- a/app/main/issue/_filters.lua Fri Aug 17 00:23:08 2012 +0200 1.2 +++ b/app/main/issue/_filters.lua Fri Aug 17 00:30:19 2012 +0200 1.3 @@ -281,7 +281,7 @@ 1.4 "END OR EXISTS(SELECT 1 FROM direct_supporter_snapshot WHERE direct_supporter_snapshot.event = issue.latest_snapshot_event AND direct_supporter_snapshot.issue_id = issue.id AND direct_supporter_snapshot.member_id = filter_d_interest_s.delegate_member_ids[array_upper(filter_d_interest_s.delegate_member_ids,1)] AND NOT direct_supporter_snapshot.satisfied)", member.id, member.id, member.id }) 1.5 1.6 elseif filter_interest == "voted" then 1.7 - selector:add_where({ "EXISTS(SELECT 1 FROM direct_voter WHERE direct_voter.issue_id = issue.id AND direct_voter.member_id = ?) OR EXISTS(SELECT 1 FROM delegating_voter WHERE delegating_voter.issue_id = issue.id AND delegating_voter.member_id = ?) ", member.id, member.id }) 1.8 + selector:add_where({ "EXISTS(SELECT 1 FROM direct_voter WHERE direct_voter.issue_id = issue.id AND direct_voter.member_id = ?) OR (issue.closed NOTNULL AND EXISTS(SELECT 1 FROM delegating_voter WHERE delegating_voter.issue_id = issue.id AND delegating_voter.member_id = ?)) ", member.id, member.id }) 1.9 1.10 end 1.11 1.12 @@ -330,7 +330,7 @@ 1.13 selector:add_where({ 1.14 "EXISTS(SELECT 1 FROM direct_supporter_snapshot WHERE direct_supporter_snapshot.event = issue.latest_snapshot_event AND direct_supporter_snapshot.issue_id = issue.id AND direct_supporter_snapshot.member_id = filter_d_interest_s.delegate_member_ids[array_upper(filter_d_interest_s.delegate_member_ids,1)] AND NOT direct_supporter_snapshot.satisfied)", member.id }) 1.15 elseif filter_interest == "voted" then 1.16 - selector:add_where({ "EXISTS(SELECT 1 FROM delegating_voter WHERE delegating_voter.issue_id = issue.id AND delegating_voter.member_id = ?) ", member.id }) 1.17 + selector:add_where({ "issue.closed NOTNULL AND EXISTS(SELECT 1 FROM delegating_voter WHERE delegating_voter.issue_id = issue.id AND delegating_voter.member_id = ?) ", member.id }) 1.18 1.19 end 1.20 end