1:41 p.m.
elections/admin.py | 1 -
elections/controllers.py | 8 +++++---
examples/elections.conf | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit ff6d3ddc809c79ef46b299f4d1fb09c17eb9060a
Author: Toshio Kuratomi <toshio(a)fedoraproject.org>
Date: Wed Jul 22 11:35:34 2009 -0700
Return the appTitle as well
diff --git a/elections/controllers.py b/elections/controllers.py
index fafd031..9365fce 100644
--- a/elections/controllers.py
+++ b/elections/controllers.py
@@ -124,6 +124,8 @@ class Root(controllers.RootController):
@expose(template="elections.templates.login", allow_json=True)
def login(self, forward_url=None, *args, **kwargs):
login_dict = fc_login(forward_url, args, kwargs)
+ login_dict['appTitle'] = '%s -- Fedora Account System Login' % \
+ self.appTitle
return login_dict
@expose(allow_json=True)
commit ba818680d1a1a8fb0745920b9e97215736eaf9d5
Author: Toshio Kuratomi <toshio(a)fedoraproject.org>
Date: Wed Jul 22 11:29:07 2009 -0700
Fix parameter and variable to be the same
diff --git a/elections/controllers.py b/elections/controllers.py
index 34a760b..fafd031 100644
--- a/elections/controllers.py
+++ b/elections/controllers.py
@@ -122,7 +122,7 @@ class Root(controllers.RootController):
return dict(votecount=votecount, usernamemap=usernamemap, election=election,
appTitle=self.appTitle)
@expose(template="elections.templates.login", allow_json=True)
- def login(self, forward_url=None, *args, **kw):
+ def login(self, forward_url=None, *args, **kwargs):
login_dict = fc_login(forward_url, args, kwargs)
return login_dict
commit c9d8b07446123ea52b301ef674621cc6142f54a5
Author: Toshio Kuratomi <toshio(a)fedoraproject.org>
Date: Wed Jul 22 11:28:13 2009 -0700
Fix import of python-fedora login/logout controller methods.
diff --git a/elections/controllers.py b/elections/controllers.py
index 804b0c4..34a760b 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.controllers.login as fc_login
-import fedora.controllers.logout as fc_logout
+import fedora.tg.controllers.login as fc_login
+import fedora.tg.controllers.logout as fc_logout
from elections import model
from elections.model import *
from elections.admin import Admin
commit 69b37a26b6b57c6137f6caa4185ae8eceeb11628
Author: Toshio Kuratomi <toshio(a)fedoraproject.org>
Date: Wed Jul 22 11:27:48 2009 -0700
Don't need SABase here.
diff --git a/elections/admin.py b/elections/admin.py
index 04de30c..6c4d428 100644
--- a/elections/admin.py
+++ b/elections/admin.py
@@ -31,7 +31,6 @@ from turbogears import identity
from elections import model
from elections.model import Elections, ElectionsTable, Candidates, LegalVoters
-from fedora.tg.json import SABase
from datetime import datetime
import sqlalchemy
commit 34cb5d85726d51fd618e0aee265cb4d684a0b37c
Author: Toshio Kuratomi <toshio(a)fedoraproject.org>
Date: Wed Jul 22 11:26:56 2009 -0700
Switch apache config to Location
diff --git a/examples/elections.conf b/examples/elections.conf
index a554bfe..b8d0155 100644
--- a/examples/elections.conf
+++ b/examples/elections.conf
@@ -4,7 +4,7 @@ WSGISocketPrefix /tmp/wsgi
WSGIRestrictStdout On
WSGIRestrictSignal Off
-WSGIPythonOptimize 2
+WSGIPythonOptimize 1
WSGIDaemonProcess daemon threads=2 processes=2
@@ -12,8 +12,8 @@ WSGIScriptAlias /elections /srv/elections/elections.wsgi/elections
Alias /elections/static /srv/elections/elections/static
-<Directory /srv/elections>
+<Location /elections>
WSGIProcessGroup daemon
Order deny,allow
Allow from all
-</Directory>
+</Location>