# HG changeset patch
# User bsw
# Date 1345424314 -7200
# Node ID 06e72cc93c64514269a707fba94bbb9f40c07905
# Parent  2cfa41e89c15c5cdf7a8d1b79fce228ac82eb62b
Respect non_voter for not voted filter

diff -r 2cfa41e89c15 -r 06e72cc93c64 app/main/issue/_filters.lua
--- a/app/main/issue/_filters.lua	Mon Aug 20 02:56:26 2012 +0200
+++ b/app/main/issue/_filters.lua	Mon Aug 20 02:58:34 2012 +0200
@@ -354,6 +354,8 @@
       selector_modifier = function(selector)
         selector:left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", member.id })
         selector:add_where("direct_voter.member_id ISNULL")
+        selector:left_join("non_voter", nil, { "non_voter.issue_id = issue.id AND non_voter.member_id = ?", member.id })
+        selector:add_where("non_voter.member_id ISNULL")
       end
     },
     {
diff -r 2cfa41e89c15 -r 06e72cc93c64 app/main/issue/_show.lua
--- a/app/main/issue/_show.lua	Mon Aug 20 02:56:26 2012 +0200
+++ b/app/main/issue/_show.lua	Mon Aug 20 02:58:34 2012 +0200
@@ -123,7 +123,8 @@
     else
       links[#links+1] = { attr = { class = "action" }, content = _"Do not vote directly" }
       links[#links+1] ={
-        content = _"Cancel do not vote",
+        in_brackets = true,
+        content = _"Cancel [nullify]",
         module = "vote",
         action = "non_voter",
         params = { issue_id = issue.id, delete = true },