elections/api.py | 9 +-------- elections/templates/admnewe.html | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-)
New commits: commit b8de64231de6d119b8edbb28323253ec049d004a Author: Nigel Jones dev@nigelj.com Date: Wed Oct 8 14:35:49 2008 +1300
Fix admnewe.html for now, fix API (thanks Toshio)
diff --git a/elections/api.py b/elections/api.py index d2a6622..ac62b2c 100644 --- a/elections/api.py +++ b/elections/api.py @@ -45,15 +45,8 @@ class Api(controllers.Controller):
@expose(allow_json=True) def list_elections(self, **kw): - elections = {} electlist = Elections.query.order_by(ElectionsTable.c.start_date).filter('id>0').all() - for e in electlist: - elections['id'] = e.id - elections['alias'] = e.alias - elections['shortdesc'] = e.shortdesc - elections['start_date'] = e.start_date - elections['end_date'] = e.end_date - elections['legal_voters'] = LegalVoters.query.filter_by(election_id=e.id).all() + elections = [{'id': e.id, 'alias': e.alias, 'shortdesc': e.shortdesc, 'start_date': e.start_date, 'end_date': e.end_date, 'legal_voters': [{'groupname': lv.group_name} for lv in LegalVoters.query.filter_by(election_id=e.id)]} for e in electlist] return dict(elections=elections, servertime=datetime.utcnow(), appTitle=self.appTitle)
#@expose(template='elections.templates.adminlist') diff --git a/elections/templates/admnewe.html b/elections/templates/admnewe.html index b0a676d..eabaabc 100644 --- a/elections/templates/admnewe.html +++ b/elections/templates/admnewe.html @@ -7,7 +7,7 @@ <title>Welcome to TurboGears</title> </head> <body> - <form action="${tg.url('/admin/newe')}" method="post"> + <form action="${tg.url('/api/newe')}" method="post"> <table> <tr><td>Election Name:</td><td><input type="text" name="shortdesc" /></td></tr> <tr><td>Alias:</td><td><input type="text" name="alias" /></td></tr>
elections-devel@lists.stg.fedorahosted.org