shared/__init__.py @@ -1,4 +1,4 @@ -from views import userRequired, render_with_user +from shared import userRequired, render_with_user from django.http import HttpResponseRedirect from django.template import loader, Context from lib import nextbus nextbus.py @@ -5,16 +5,13 @@ from models import * from forms import * import google.appengine.ext.db from lib import nextbus +from shared import userRequired, render_with_user defaultSource='nb' def getDefaultSource(): """return the default source site for user (nextbus for now)""" return defaultSource - -def render_with_user(tpl, vars={}): - vars['user'] = users.get_current_user() - return render_to_response(tpl, vars) def home(r): user = users.get_current_user() @@ -34,20 +31,6 @@ def login(r): def logout(r): return HttpResponseRedirect(users.create_logout_url('/')) - - -def userRequired(fn): - """decorator for forcing a login""" - def new(*args, **kws): - user = users.get_current_user() - if not (user): - r = args[0] - return HttpResponseRedirect(users.create_login_url( - r.build_absolute_uri())) - else: - return fn(*args, **kws) - return new - @userRequired def addBmark(r): if (r.method) == 'POST': views.py 577ef5e6ffe7fb17cc379cb53e203283574f22ab mihasya m@mihasya.com http://github.com/mihasya/yourmuni/commit/64505e63dd3f5bed869ff3a5ead1e981e9580110 64505e63dd3f5bed869ff3a5ead1e981e9580110 2009-01-21T17:47:56-08:00 2009-01-21T17:47:56-08:00 moved common stuff into a shared folder 58d83c0f43436c9896e71fdaae434796cab297ff mihasya m@mihasya.com