Always list residents first, then sort by username.

[bluechips.git] / bluechips / lib / base.py

diff --git a/bluechips/lib/base.py b/bluechips/lib/base.py
index 8e7c20cfdfefe88a529456f2f335114ccf33250a..e485c5732139b9768f4ba9be38821565615763f3 100644 (file)
--- a/bluechips/lib/base.py
+++ b/bluechips/lib/base.py
@@ -52,15 +52,24 @@ def redirect_on_get(action):
     return redirect_on_get_wrap
 
 def render(name, *args, **kwargs):
-    if 'iPhone' in request.user_agent:
+    if any([x in request.user_agent for x in ('iPhone','webOS')]):
+        if 'use_non_mobile' in request.params:
+            session['use_non_mobile'] = (request.params['use_non_mobile'] ==
+                                         'yes')
         if session.get('use_non_mobile'):
             c.mobile_client = True
         else:
             try:
                 return render_mako('/mobile' + name, *args, **kwargs)
             except TopLevelLookupException:
-                pass
+                # If a mobile template doesn't exist for this page, don't show
+                # the 'use mobile interface' link.
+                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']