From 88740b2a08d0667f1128319405d80a1c7ce051af Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Wed, 28 Jul 2010 20:46:04 -0700 Subject: [PATCH] Always list residents first, then sort by username. --- bluechips/controllers/spend.py | 2 +- bluechips/controllers/status.py | 2 +- bluechips/controllers/transfer.py | 2 +- bluechips/lib/base.py | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bluechips/controllers/spend.py b/bluechips/controllers/spend.py index 8000fd3..cf691cc 100644 --- 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 df0522e..bdb4f45 100644 --- 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 5c147bc..46bc77b 100644 --- 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 d04f981..e485c57 100644 --- 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'] -- 2.45.2