elections/admin.py | 8 +-------
elections/controllers.py | 6 +++---
elections/templates/about.html | 6 ------
elections/templates/admnewe.html | 2 +-
4 files changed, 5 insertions(+), 17 deletions(-)
New commits:
commit 89dbb9eb0ce108971010a1f52cc475bf474695ca
Author: Nigel Jones <nigjones(a)njones.bne.redhat.com>
Date: Thu Nov 26 21:45:19 2009 +1000
Random fix ups to make the current code work as the old did.
Summary:
* Template Logic mess-ups (oops)
* DB inconsistencies (now works with new layout, migration steps ready to perform)
* Correction to toshio's CSRF/python-fedora patch
diff --git a/elections/admin.py b/elections/admin.py
index 6c4d428..2f7f7d1 100644
--- a/elections/admin.py
+++ b/elections/admin.py
@@ -59,19 +59,13 @@ class Admin(controllers.Controller):
def newe(self, **kw):
if "submit" in kw:
setembargo=1
- setnominations=1
- nominationend=0
usefas=1
if "embargoed" not in kw:
setembargo=0
- if "allownominations" not in kw:
- setnominations=0
- if "nominationend" in kw:
- nominationend=kw['nominationend']
if "usefas" not in kw:
usefas=0
- Elections(alias=kw['alias'], status=0, method=0,
shortdesc=kw['shortdesc'], description=kw['info'], url=kw['url'],
start_date=kw['startdate'], end_date=kw['enddate'], embargoed=setembargo,
seats_elected=kw['seats'], allow_nominations=setnominations,
nomination_end=nominationend,usefas=usefas)
+ Elections(alias=kw['alias'], status=0, method=0,
shortdesc=kw['shortdesc'], description=kw['info'], url=kw['url'],
start_date=kw['startdate'], end_date=kw['enddate'], embargoed=setembargo,
seats_elected=kw['seats'],usefas=usefasvotes_per_user=1)
raise turbogears.redirect("/")
else:
return dict()
diff --git a/elections/controllers.py b/elections/controllers.py
index 9365fce..be91cf5 100644
--- a/elections/controllers.py
+++ b/elections/controllers.py
@@ -29,8 +29,8 @@ from turbogears.database import session
from cherrypy import request, response
from fedora.client.fas2 import AccountSystem
-import fedora.tg.controllers.login as fc_login
-import fedora.tg.controllers.logout as fc_logout
+from fedora.tg.controllers import login as fc_login
+from fedora.tg.controllers import logout as fc_logout
from elections import model
from elections.model import *
from elections.admin import Admin
@@ -49,7 +49,7 @@ class Root(controllers.RootController):
password = config.get('fas.password', 'admin')
fas = AccountSystem(baseURL, username=username, password=password)
- api = Api(fas, appTitle)
+ admin = Admin(fas, appTitle)
vote = Vote(fas, appTitle)
diff --git a/elections/templates/about.html b/elections/templates/about.html
index 44655ef..2b8158e 100644
--- a/elections/templates/about.html
+++ b/elections/templates/about.html
@@ -16,15 +16,9 @@
</tr>
<py:choose test="curtime > election.end_date"><py:when
test="0">
<py:choose test="election.start_date > curtime"><py:when
test="0">
- <py:choose test="election.allow_nominations"><py:when
test="1">
- <tr>
- <td><a href="${tg.url('/nominate/' +
election.alias)}">Nominate Someone!</a></td>
- </tr>
- </py:when><py:when test="1">
<tr>
<td><a href="${tg.url('/vote/' +
election.alias)}">Vote Now!</a></td>
</tr>
- </py:when></py:choose>
</py:when></py:choose>
</py:when><py:when test="1">
<tr>
diff --git a/elections/templates/admnewe.html b/elections/templates/admnewe.html
index eabaabc..b0a676d 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('/api/newe')}" method="post">
+ <form action="${tg.url('/admin/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>
Show replies by date