Always list residents first, then sort by username.

diff --git a/bluechips/controllers/spend.py b/bluechips/controllers/spend.py
index 8000fd377a8a331b6efc0e73e85f726b1726eda5..cf691cce522cf74b6eb1ea4c498584c1cf3de868 100644 (file)
--- a/bluechips/controllers/spend.py
+++ b/bluechips/controllers/spend.py
@@ -53,7 +53,7 @@ class SpendController(BaseController):
         return self.edit()
     
     def edit(self, id=None):
-        c.users = meta.Session.query(model.User.id, model.User)
+        c.users = get_users()
         if id is None:
             c.title = 'Add a New Expenditure'
             c.expenditure = model.Expenditure()

diff --git a/bluechips/controllers/status.py b/bluechips/controllers/status.py
index df0522e4a359ed8951a67dc4857afdad665767f1..bdb4f4580870b169d3d174bd54e6c7574784cb95 100644 (file)
--- a/bluechips/controllers/status.py
+++ b/bluechips/controllers/status.py
@@ -73,7 +73,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)
+        c.users = get_users()
         
         return render('/status/index.mako')
     

diff --git a/bluechips/controllers/transfer.py b/bluechips/controllers/transfer.py
index 5c147bc35456a97a3b70ae439929d2291f62020d..46bc77b9f6f10c168feff9efd22423b1019183fc 100644 (file)
--- a/bluechips/controllers/transfer.py
+++ b/bluechips/controllers/transfer.py
@@ -35,7 +35,7 @@ class TransferController(BaseController):
        return self.edit()
     
     def edit(self, id=None):
-        c.users = meta.Session.query(model.User.id, model.User.name)
+        c.users = get_users()
         if id is None:
             c.title = 'Add a New Transfer'
             c.transfer = model.Transfer()

diff --git a/bluechips/lib/base.py b/bluechips/lib/base.py
index d04f98160d38c95a8e50171c704ae34378c37263..e485c5732139b9768f4ba9be38821565615763f3 100644 (file)
--- a/bluechips/lib/base.py
+++ b/bluechips/lib/base.py
@@ -67,5 +67,9 @@ def render(name, *args, **kwargs):
                 c.mobile_client = False
     return render_mako(name, *args, **kwargs)
 
+def get_users():
+    return meta.Session.query(model.User.id, model.User).\
+        order_by(model.User.resident.desc(), model.User.username)
+
 __all__ = ['c', 'h', 'render', 'model', 'meta', '_', 'ungettext', 'N_',
-           'BaseController', 'update_sar', 'redirect_on_get']
+           'BaseController', 'update_sar', 'redirect_on_get', 'get_users']