# HG changeset patch # User bsw # Date 1345424345 -7200 # Node ID 6ba4ebe7b707dfbf74247d769d5d08f546de30d4 # Parent 06e72cc93c64514269a707fba94bbb9f40c07905 Respect non_voter for not voted issues notification diff -r 06e72cc93c64 -r 6ba4ebe7b707 app/main/index/_notifications.lua --- a/app/main/index/_notifications.lua Mon Aug 20 02:58:34 2012 +0200 +++ b/app/main/index/_notifications.lua Mon Aug 20 02:59:05 2012 +0200 @@ -28,8 +28,10 @@ :join("area", nil, "area.id = issue.area_id") :join("privilege", nil, { "privilege.unit_id = area.unit_id AND privilege.member_id = ? AND privilege.voting_right", app.session.member_id }) :left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id }) + :left_join("non_voter", nil, { "non_voter.issue_id = issue.id AND non_voter.member_id = ?", app.session.member.id }) :left_join("interest", nil, { "interest.issue_id = issue.id AND interest.member_id = ?", app.session.member.id }) :add_where{ "direct_voter.member_id ISNULL" } + :add_where{ "non_voter.member_id ISNULL" } :add_where{ "interest.member_id NOTNULL" } :add_where{ "issue.fully_frozen NOTNULL" } :add_where{ "issue.closed ISNULL" }