From afac08ebe9394e6794197e732d6516ec0dec706a Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Tue, 28 Sep 2010 19:51:12 -0700
Subject: [PATCH] fixed logic for deletion of voter
---
fabfile.py | 1 +
helios/views.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/fabfile.py b/fabfile.py
index b47ec41..89795bf 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -36,6 +36,7 @@ def check_tag(tag, path):
with cd(path):
run('git pull origin master')
+ run('git fetch --tags')
result = run('git tag')
if tag not in result.split("\n"):
abort("no remote tag %s" % tag)
diff --git a/helios/views.py b/helios/views.py
index 007b40f..f47b871 100644
--- a/helios/views.py
+++ b/helios/views.py
@@ -634,7 +634,8 @@ def voter_delete(request, election, voter_uuid):
- election is not frozen or
- election is open reg
"""
- if not (election.frozen_at or election.openreg):
+ # if election is frozen and has closed registration
+ if election.frozen_at and (not election.openreg):
raise PermissionDenied()
if election.encrypted_tally:
--
GitLab