Merge branch 'master' into mobile_interface

[bluechips.git] / bluechips / controllers / status.py

diff --git a/bluechips/controllers/status.py b/bluechips/controllers/status.py
index 04ad79b6a5bce8476f51942fe8172f81ca1770d5..7e81cd505854151136b98797c4659689d6ca413f 100644 (file)
--- a/bluechips/controllers/status.py
+++ b/bluechips/controllers/status.py
@@ -66,6 +66,7 @@ class StatusController(BaseController):
                 model.Transfer.debtor==request.environ['user'],
                 model.Transfer.creditor==request.environ['user'])).\
                 limit(10).all()
+        c.users = meta.Session.query(model.User.id, model.User)
         
         return render('/status/index.mako')