diff --git a/inventory-app/doorboy.py b/inventory-app/doorboy.py index 41ecbb6..fd731b7 100644 --- a/inventory-app/doorboy.py +++ b/inventory-app/doorboy.py @@ -94,10 +94,7 @@ def view_doorboy_hold(): "timestamp": datetime.utcnow(), "door": form.door_name.data, "approved": True, - "user": { - "id": user["username"], - "name": user["name"] - }, + "user": user["username"], "expires": datetime.utcnow() + timedelta(seconds=form.duration.data) }) return redirect("/m/doorboy") @@ -120,10 +117,7 @@ def view_doorboy_open(door): "timestamp": datetime.utcnow(), "door": door, "approved": approved, - "user": { - "id": user["username"], - "name": user["name"] - } + "user": user["username"], }) if approved: @@ -163,5 +157,5 @@ def view_user_cards_inner(username): @page_doorboy.route("/m/doorboy/log/") @login_required(groups=["k-space:board", "k-space:kubernetes:admins"]) def view_user_events(username): - latest_events = db.doorlog.find({"inventory.owner_id": username}).sort([("timestamp", -1)]) + latest_events = db.doorlog.find({"user": username}).sort([("timestamp", -1)]) return render_template("doorboy_log.html", latest_events=latest_events)