You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@steve.apache.org by hu...@apache.org on 2016/02/09 10:38:38 UTC
svn commit: r1729339 - in /steve/trunk/pysteve: lib/backends/es.py
lib/backends/files.py www/cgi-bin/rest_admin.py
Author: humbedooh
Date: Tue Feb 9 09:38:37 2016
New Revision: 1729339
URL: http://svn.apache.org/viewvc?rev=1729339&view=rev
Log:
turns out we can get basedata ourselves, yay
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=1729339&r1=1729338&r2=1729339&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/backends/es.py (original)
+++ steve/trunk/pysteve/lib/backends/es.py Tue Feb 9 09:38:37 2016
@@ -67,8 +67,9 @@ class ElasticSearchBackend:
return None
- def close(self, election, basedata, reopen = False):
+ def close(self, election, reopen = False):
"Mark an election as closed"
+ basedata = self.get_basedata(election)
if reopen == True:
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=1729339&r1=1729338&r2=1729339&view=diff
==============================================================================
--- steve/trunk/pysteve/lib/backends/files.py (original)
+++ steve/trunk/pysteve/lib/backends/files.py Tue Feb 9 09:38:37 2016
@@ -53,9 +53,9 @@ class FileBasedBackend:
return basedata
return None
- def close(self, election, basedata, reopen = False):
+ def close(self, election, reopen = False):
"Mark an election as closed"
-
+ basedata = self.get_basedata(election)
elpath = os.path.join(self.homedir, "issues", election)
if reopen:
basedata['closed'] = False
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=1729339&r1=1729338&r2=1729339&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:38:37 2016
@@ -435,7 +435,7 @@ else:
basedata = election.getBasedata(electionID)
if karma >= 4 or ('owner' in basedata and basedata['owner'] == whoami):
try:
- election.close(electionID, basedata, reopen=ro)
+ election.close(electionID, reopen=ro)
if ro:
response.respond(200, {'message': "Election reopened"})
else: