From: Scott Torborg <scott@crookedmedia.com>
Date: Tue, 3 Nov 2009 01:20:46 +0000 (-1000)
Subject: whoops, there was already user in request.environ
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1e4dfac7ed0c6a2c8d23f82d2ca071a27401abcf;p=bluechips.git

whoops, there was already user in request.environ
---

diff --git a/bluechips/lib/base.py b/bluechips/lib/base.py
index d94eeb6..259bb0d 100644
--- a/bluechips/lib/base.py
+++ b/bluechips/lib/base.py
@@ -32,8 +32,6 @@ class BaseController(WSGIController):
                 environ['PATH_INFO'] += '/'
                 raise HTTPMovedPermanently(construct_url(environ))
         try:
-            c.user = meta.Session.query(model.User).\
-                    filter_by(username=unicode(environ['REMOTE_USER'])).one()
             return WSGIController.__call__(self, environ, start_response)
         finally:
             meta.Session.remove()
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 73fb664..23e32f1 100644
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -62,7 +62,7 @@
 </%def>
 
 <%def name="formatUser(user)">
-  % if user == c.user:
+  % if user == request.environ['user']:
     <strong>Me</strong>
   % else:
     ${user.name}
@@ -80,7 +80,7 @@
     </tr>
     % for e in es:
       <%
-        if e.involves(c.user):
+        if e.involves(request.environ['user']):
           klass = 'user-involved'
         else:
           klass = 'user-not-involved'
@@ -108,7 +108,7 @@
     </tr>
     % for t in ts:
       <%
-        if t.involves(c.user):
+        if t.involves(request.environ['user']):
           klass = 'user-involved'
         else:
           klass = 'user-not-involved'