whoops, there was already user in request.environ

diff --git a/bluechips/lib/base.py b/bluechips/lib/base.py
index d94eeb664e40d3fda2561fda30b042f1f50e3893..259bb0dd5613f8c1c43980ef1964ddf7dda08a8c 100644 (file)
--- 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 73fb66404aa1cd1775c2fea28a22d19cb53014e1..23e32f1469ac123eaa7c0e4c5ab670bd3528b8b3 100644 (file)
--- 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'