lfapi
changeset 30:da01cace6378
Member options must work on delegating member, not delegate member.
author | bsw |
---|---|
date | Sun Nov 06 21:01:57 2011 +0100 (2011-11-06) |
parents | 1956fe9e9d62 |
children | 16fc71c6ab8c |
files | lfapi/main.js |
line diff
1.1 --- a/lfapi/main.js Sun Nov 06 20:30:02 2011 +0100 1.2 +++ b/lfapi/main.js Sun Nov 06 21:01:57 2011 +0100 1.3 @@ -840,7 +840,8 @@ 1.4 query.from('direct_supporter_snapshot', 'supporter'); 1.5 1.6 if (params.delegating == '1') { 1.7 - query.join('delegating_interest_snapshot', 'interest', 'interest.issue_id = supporter.issue_id AND interest.delegate_member_ids @> ARRAY[supporter.member_id] AND interest.event = supporter.event'); 1.8 + query.join('delegating_interest_snapshot', 'interest', 'interest.issue_id = supporter.issue_id AND interest.delegate_member_ids @> array[supporter.member_id::int] AND interest.event = supporter.event'); 1.9 + query.join('member', null, 'member.id = interest.member_id'); 1.10 if (params.delegate_member_id) { 1.11 query.addWhere(['interest.delegate_member_ids @> array[?::int]', params.delegate_member_id]); 1.12 } 1.13 @@ -849,6 +850,7 @@ 1.14 } 1.15 } else { 1.16 query.join('direct_interest_snapshot', 'interest', 'interest.issue_id = supporter.issue_id AND interest.member_id = supporter.member_id AND interest.event = supporter.event'); 1.17 + query.join('member', null, 'member.id = supporter.member_id'); 1.18 query.addField('supporter.informed, supporter.satisfied'); 1.19 } 1.20 1.21 @@ -878,10 +880,11 @@ 1.22 return; 1.23 }; 1.24 query.from('supporter') 1.25 + query.join('member', null, 'member.id = supporter.member_id'); 1.26 query.addField('supporter.*'); 1.27 query.addWhere(['supporter.member_id = ?', req.current_member_id]); 1.28 } 1.29 - query.join('member', null, 'member.id = supporter.member_id JOIN initiative ON initiative.id = supporter.initiative_id JOIN issue ON issue.id = initiative.issue_id JOIN policy ON policy.id = issue.policy_id JOIN area ON area.id = issue.area_id JOIN unit ON area.unit_id = unit.id'); 1.30 + query.join('initiative', null, 'initiative.id = supporter.initiative_id JOIN issue ON issue.id = initiative.issue_id JOIN policy ON policy.id = issue.policy_id JOIN area ON area.id = issue.area_id JOIN unit ON area.unit_id = unit.id'); 1.31 general_params.addMemberOptions(req, query, params); 1.32 general_params.addInitiativeOptions(req, query, params); 1.33 query.addOrderBy('supporter.issue_id, supporter.initiative_id, supporter.member_id');