Author: humbedooh
Date: Tue Feb 9 09:30:50 2016
New Revision: 1729336
URL: http://svn.apache.org/viewvc?rev=1729336&view=rev
Log:
can't get basedata that way, so we'll have to pass it.
Modified:
steve/trunk/pysteve/lib/backends/es.py
steve/trunk/pysteve/lib/backends/files.py
steve/trunk/pysteve/www/cgi-bin/rest_admin.py
Modified: steve/trunk/pysteve/lib/backends/es.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/lib/backends/es.py?rev=1729336&r1=1729335&r2=1729336&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/backends/es.py (original)
+++ steve/trunk/pysteve/lib/backends/es.py Tue Feb 9 09:30:50 2016
@@ -67,9 +67,8 @@ class ElasticSearchBackend:
return None
- def close(self, election, reopen = False):
+ def close(self, election, basedata, reopen = False):
"Mark an election as closed"
- basedata = getBasedata(election)
if reopen:
basedata['closed'] = False
else:
Modified: steve/trunk/pysteve/lib/backends/files.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/lib/backends/files.py?rev=1729336&r1=1729335&r2=1729336&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/backends/files.py (original)
+++ steve/trunk/pysteve/lib/backends/files.py Tue Feb 9 09:30:50 2016
@@ -53,11 +53,10 @@ class FileBasedBackend:
return basedata
return None
- def close(self, election, reopen = False):
+ def close(self, election, basedata, reopen = False):
"Mark an election as closed"
elpath = os.path.join(self.homedir, "issues", election)
- basedata = getBasedata(election)
if reopen:
basedata['closed'] = False
else:
Modified: steve/trunk/pysteve/www/cgi-bin/rest_admin.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/www/cgi-bin/rest_admin.py?rev=1729336&r1=1729335&r2=1729336&view=diff
==============================================================================
--- steve/trunk/pysteve/www/cgi-bin/rest_admin.py (original)
+++ steve/trunk/pysteve/www/cgi-bin/rest_admin.py Tue Feb 9 09:30:50 2016
@@ -431,7 +431,7 @@ else:
basedata = election.getBasedata(electionID)
if karma >= 4 or ('owner' in basedata and basedata['owner'] ==
whoami):
try:
- election.close(electionID, reopen=reopen)
+ election.close(electionID, basedata, reopen=reopen)
if reopen:
response.respond(200, {'message': "Election
reopened"})
else:
