Refactored list checkbox sort

cps/admin.py

@@ -246,15 +246,16 @@ def list_users():
     limit = int(request.args.get("limit") or 10)
     search = request.args.get("search")
     sort = request.args.get("sort", "state")
-    order = request.args.get("order")
+    order = request.args.get("order", "").lower()
     state = None
-    if sort != "state" and order:
-        order = text(sort + " " + order)
-    else:
-        order = ub.User.name.desc()
     if sort == "state":
         state = json.loads(request.args.get("state"))
 
+    if sort != "state" and order:
+        order = text(sort + " " + order)
+    elif not state:
+        order = ub.User.name.desc()
+
     all_user = ub.session.query(ub.User)
     if not config.config_anonbrowse:
         all_user = all_user.filter(ub.User.role.op('&')(constants.ROLE_ANONYMOUS) != constants.ROLE_ANONYMOUS)
@@ -266,16 +267,7 @@ def list_users():
                                     func.lower(ub.User.kindle_mail).ilike("%" + search + "%"),
                                     func.lower(ub.User.email).ilike("%" + search + "%")))
     if state:
-        outcome = list()
-        userlist = {user.id:user for user in all_user.all()}
-        for entry in state:
-            outcome.append(userlist[entry])
-            del userlist[entry]
-        for entry in userlist:
-            outcome.append(userlist[entry])
-        if request.args.get("order", "").lower() == "asc":
-            outcome.reverse()
-        users = outcome[off:off + limit]
+        users = calibre_db.get_checkbox_sorted(all_user.all(), state, off, limit, request.args.get("order", "").lower())
     else:
         users = all_user.order_by(order).offset(off).limit(limit).all()
     if search: