Read user display names from kubernetes
All checks were successful
ci/woodpecker/manual/woodpecker Pipeline was successful

This commit is contained in:
2023-08-05 19:28:10 +03:00
parent 2e65de8c2a
commit 8b9ac4b92b
8 changed files with 43 additions and 57 deletions

View File

@@ -360,8 +360,8 @@ def view_inventory(slug=None):
template = "inventory_public.html"
public_view = True
else:
fields.append(("inventory.owner", "Owner", ObjectId))
fields.append(("inventory.user", "User", ObjectId))
fields.append(("inventory.owner.username", "Owner", list))
fields.append(("inventory.user.username", "User", list))
if slug and not public_view:
template = "inventory_pick.html"
if request.path.startswith("/m/inventory/clone-with-slug"):
@@ -378,9 +378,9 @@ def view_inventory(slug=None):
if grid:
template = "inventory_grid.html"
if user:
q["inventory.user.foreign_id"] = user
q["inventory.user.username"] = user
if owner:
q["inventory.owner.foreign_id"] = owner
q["inventory.owner.username"] = owner
q2 = {"type": {"$ne": "token"}}
if not public_view and owner_disabled:
@@ -390,22 +390,6 @@ def view_inventory(slug=None):
q, selectors, sort_field, sort_field_final, sort_direction = build_query(dict(q), fields, sort_fields)
items = db.inventory.aggregate([
{ "$match": q },
{
"$lookup": {
"from": 'member',
"localField": 'inventory.owner.foreign_id',
"foreignField": '_id',
"as": 'Owner'
}
},
{
"$lookup": {
"from": 'member',
"localField": 'inventory.user.foreign_id',
"foreignField": '_id',
"as": 'User'
}
},
{ "$match": q2 },
{ "$sort": { sort_field_final : 1 if sort_direction == "asc" else -1 } }
])
@@ -421,7 +405,7 @@ def view_inventory_claim(item_id):
"inventory.owner.foreign_id": None
}, {
"$set": {
"inventory.owner.foreign_id": user["username"],
"inventory.owner.username": user["username"],
"inventory.owner.display_name": user["name"],
},
})
@@ -444,7 +428,7 @@ def view_inventory_use(item_id):
"_id": ObjectId(item["_id"])
}, {
"$set": {
"inventory.user.foreign_id": ObjectId(user["username"]),
"inventory.user.username": user["username"],
"inventory.user.display_name": user["name"],
},
})
@@ -463,7 +447,7 @@ def view_inventory_vacate(item_id):
item = db.inventory.find_one({
"_id": ObjectId(item_id),
"inventory.usable": True,
"inventory.user.foreign_id": ObjectId(user["username"])
"inventory.user.username": user["username"]
})
if not item:
return abort(404)