Pin K-SPACE to user fields top
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
@@ -106,6 +106,7 @@ def slack_post(msg, channel):
|
|||||||
requests.post(url, json={"text": msg })
|
requests.post(url, json={"text": msg })
|
||||||
|
|
||||||
def build_query(base_query, fields=[], sort_fields={}):
|
def build_query(base_query, fields=[], sort_fields={}):
|
||||||
|
top_usernames= ['k-space']
|
||||||
selectors = []
|
selectors = []
|
||||||
q = base_query.copy()
|
q = base_query.copy()
|
||||||
for attr, title, tp in fields:
|
for attr, title, tp in fields:
|
||||||
@@ -119,6 +120,9 @@ def build_query(base_query, fields=[], sort_fields={}):
|
|||||||
if key in ("inventory_owner_username", "inventory_user_username"):
|
if key in ("inventory_owner_username", "inventory_user_username"):
|
||||||
results = [{"username": u, "display_name": g.users_lookup.get(u, User()).display_name or u} for u in results]
|
results = [{"username": u, "display_name": g.users_lookup.get(u, User()).display_name or u} for u in results]
|
||||||
results = sorted(results, key = lambda k: k["display_name"])
|
results = sorted(results, key = lambda k: k["display_name"])
|
||||||
|
top = [k for k in results if k["username"] in top_usernames]
|
||||||
|
rest = [k for k in results if k["username"] not in top_usernames]
|
||||||
|
results = top + rest
|
||||||
elif tp != list:
|
elif tp != list:
|
||||||
results = sorted(results)
|
results = sorted(results)
|
||||||
results = list(map(tp, results))
|
results = list(map(tp, results))
|
||||||
|
@@ -68,12 +68,15 @@ def get_image_url(item_id):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
def fetch_members_select():
|
def fetch_members_select():
|
||||||
|
top_usernames= ['k-space', None]
|
||||||
choices = [(None, None)]
|
choices = [(None, None)]
|
||||||
for username, user in g.users_lookup.items():
|
for username, user in g.users_lookup.items():
|
||||||
choices.append((username, user.display_name or username))
|
choices.append((username, user.display_name or username))
|
||||||
choices = list(set(choices))
|
choices = list(set(choices))
|
||||||
choices = sorted(choices, key = lambda k: k[1] or "")
|
choices = sorted(choices, key = lambda k: k[1] or "")
|
||||||
return choices
|
top = [k for k in choices if k[0] in top_usernames]
|
||||||
|
rest = [k for k in choices if k[0] not in top_usernames]
|
||||||
|
return top + rest
|
||||||
|
|
||||||
def fetch_type_select():
|
def fetch_type_select():
|
||||||
objs = db.inventory.distinct("type")
|
objs = db.inventory.distinct("type")
|
||||||
|
Reference in New Issue
Block a user