~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/base/xhtml.py

Committer: William Grant
Date: 2009-02-16 04:51:05 UTC
mfrom: (1099.1.128 new-dispatch)
mto: (1092.1.63 setup-stuff) (1099.1.151 new-dispatch)
mto: This revision was merged to the branch mainline in revision 1100.
Revision ID: grantw@unimelb.edu.au-20090216045105-sc5hg5ol8qydwisr

Merge from new-dispatch.

files added:
ivle/webapp/security/login.html

ivle/webapp/tos/accept.html

files renamed:
ivle/webapp/tos/template.html => ivle/webapp/tos/view.html

files modified:
ivle/auth/authenticate.py

ivle/database.py

ivle/dispatch/__init__.py

ivle/dispatch/login.py

ivle/webapp/base/ivle-headings.html

ivle/webapp/base/xhtml.py

ivle/webapp/coremedia/tos.js

ivle/webapp/filesystem/browser/__init__.py

ivle/webapp/security/__init__.py

ivle/webapp/security/views.py

ivle/webapp/tos/__init__.py

www/apps/userservice/__init__.py

Show diffs side-by-side

added added

removed removed

ivle/webapp/base/xhtml.py

import inspect

import os.path

import urllib

import genshi.template

184

185

186

def __init__(self, req, exception):

186

187

super(XHTMLUnauthorizedView, self).__init__(req, exception)

188

187

189

if req.user is None:

188

190

# Not logged in. Redirect to login page.

189

req.throw_redirect('/') # XXX: Need proper URL.

191

req.throw_redirect('/+login?' +

192

urllib.urlencode([('url', req.uri)]))

190

193

191

194

req.status = 403

Older »