After-login redirects

brendonh · Jun 2, 2011 · b3cc2a0 · b3cc2a0
1 parent dac9dd2
commit b3cc2a0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/warp/common/avatar.py b/warp/common/avatar.py
@@ -44,6 +44,7 @@ class DBSession(Storm):
 
     language = u"en_US"
     messages = None
+    afterLogin = None
 
     def __storm_loaded__(self):
         if self.language is None:

diff --git a/warp/templates/accessdenied.mak b/warp/templates/accessdenied.mak
@@ -0,0 +1 @@
+ACCESS DENIED
diff --git a/warp/webserver/auth.py b/warp/webserver/auth.py
@@ -13,7 +13,15 @@ class LoginBase(object):
 
     def render(self, request):
         self.doIt(request)
-        url = "/%s" % "/".join(request.postpath)
+
+        if request.session.avatar is not None and request.session.afterLogin is not None:
+            url = request.session.afterLogin
+            request.session.afterLogin = None
+        else:
+            url = "/%s" % "/".join(request.postpath)
+
+        print repr(request.session.afterLogin)
+
         request.redirect(url)
         return "Redirecting..."
 

diff --git a/warp/webserver/resource.py b/warp/webserver/resource.py
@@ -135,9 +135,14 @@ class AccessDenied(object):
     implements(IResource)
 
     isLeaf = True
+    facetName = "view"
+    args = ()
 
     def render(self, request):
-        return "ACCESS DENIED"
+        request.node = None
+        request.resource = self
+        template = templateLookup.get_template("/accessdenied.mak")
+        return helpers.renderTemplateObj(request, template)