Stop using pylons.h.

[zzz-floof.git] / floof / lib / base.py

diff --git a/floof/lib/base.py b/floof/lib/base.py
index d2756ba..b42d2be 100644 (file)
--- a/floof/lib/base.py
+++ b/floof/lib/base.py
@@ -2,19 +2,24 @@
 
 Provides the BaseController class for subclassing.
 """
 
 Provides the BaseController class for subclassing.
 """

-from pylons import session, tmpl_context as c

 from pylons.controllers import WSGIController
 from pylons.controllers import WSGIController

+from pylons.controllers.util import abort, redirect

 from pylons.templating import render_mako as render
 from pylons.templating import render_mako as render

+from pylons import config, request, session, tmpl_context as c
+from routes import request_config

 
 from floof import model
 
 from floof import model

-from floof.model import meta
+from floof.model.users import User

 
 class BaseController(WSGIController):
 
 
 class BaseController(WSGIController):
 

-    def __before__(self, action, **params):
+    # NOTE: This could have been implemented as a middleware =]
+    def __before__(self):
+        c.route = request_config().mapper_dict
+

         # Fetch current user object
         try:
         # Fetch current user object
         try:

-            c.user = meta.Session.query(model.User).get(session['user_id'])
+            c.user = User.query.get(session['user_id'])

         except:
             pass
 
         except:
             pass
 


@@ -23,7 +28,18 @@ class BaseController(WSGIController):
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']

+
+        # Insert any code to be run per request here.
+

         try:
             return WSGIController.__call__(self, environ, start_response)
         finally:
         try:
             return WSGIController.__call__(self, environ, start_response)
         finally:

-            meta.Session.remove()
+            model.Session.remove()
+
+
+    def redirect_to_referrer(self):
+        """Performs a redirect_to to wherever we came from.  Used for stuff
+        like logging in.
+        """
+        referrer = request.headers.get('REFERER', '/')
+        redirect(referrer, code=302)