liquid_feedback_frontend
changeset 888:06e72cc93c64
Respect non_voter for not voted filter
author | bsw |
---|---|
date | Mon Aug 20 02:58:34 2012 +0200 (2012-08-20) |
parents | 2cfa41e89c15 |
children | 6ba4ebe7b707 |
files | app/main/issue/_filters.lua app/main/issue/_show.lua |
line diff
1.1 --- a/app/main/issue/_filters.lua Mon Aug 20 02:56:26 2012 +0200 1.2 +++ b/app/main/issue/_filters.lua Mon Aug 20 02:58:34 2012 +0200 1.3 @@ -354,6 +354,8 @@ 1.4 selector_modifier = function(selector) 1.5 selector:left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", member.id }) 1.6 selector:add_where("direct_voter.member_id ISNULL") 1.7 + selector:left_join("non_voter", nil, { "non_voter.issue_id = issue.id AND non_voter.member_id = ?", member.id }) 1.8 + selector:add_where("non_voter.member_id ISNULL") 1.9 end 1.10 }, 1.11 {
2.1 --- a/app/main/issue/_show.lua Mon Aug 20 02:56:26 2012 +0200 2.2 +++ b/app/main/issue/_show.lua Mon Aug 20 02:58:34 2012 +0200 2.3 @@ -123,7 +123,8 @@ 2.4 else 2.5 links[#links+1] = { attr = { class = "action" }, content = _"Do not vote directly" } 2.6 links[#links+1] ={ 2.7 - content = _"Cancel do not vote", 2.8 + in_brackets = true, 2.9 + content = _"Cancel [nullify]", 2.10 module = "vote", 2.11 action = "non_voter", 2.12 params = { issue_id = issue.id, delete = true },