k-space/inventory-app
13
0
Fork 0
Code Issues 16 Pull Requests 1 Packages Activity

rm owner_disabled, user_disabled

Browse Source 
- Not functional as OIDC is external.
- Inventory is checked as part of offboarding.
- Easily spottable as already offboarded users don't have full names.
This commit is contained in:
rasmus
2025-06-01 14:59:30 +03:00
parent 5e4e53b889
commit af524f29d0
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inventory-app/inventory.py
View File

@@ -408,8 +408,6 @@ def view_inventory(slug=None):
user = request.args.get("user", type=ObjectId) user = request.args.get("user", type=ObjectId)
owner = request.args.get("owner", type=ObjectId) owner = request.args.get("owner", type=ObjectId)
grid = request.args.get("grid", type=str) == "true" grid = request.args.get("grid", type=str) == "true"
owner_disabled = request.args.get("owner_disabled", type=str) == "true"
user_disabled = request.args.get("user_disabled", type=str) == "true"
sort_fields = { sort_fields = {
"last_seen": "Last seen", "last_seen": "Last seen",
"inventory_audit_timestamp": "Last audited", "inventory_audit_timestamp": "Last audited",
@@ -473,16 +471,10 @@ def view_inventory(slug=None):
q["inventory.user.username"] = user q["inventory.user.username"] = user
if owner: if owner:
q["inventory.owner.username"] = owner q["inventory.owner.username"] = owner
q2 = {"type": {"$ne": "token"}}
if not public_view and owner_disabled:
q2["Owner.enabled"] = False
if not public_view and user_disabled:
q2["User.enabled"] = False
q, selectors, sort_field, sort_field_final, sort_direction = build_query(dict(q), fields, sort_fields) q, selectors, sort_field, sort_field_final, sort_direction = build_query(dict(q), fields, sort_fields)
items = db.inventory.aggregate([ items = db.inventory.aggregate([
{ "$match": q }, { "$match": q },
{ "$match": q2 }, { "$match": {"type": {"$ne": "token"}} },
{ "$sort": { sort_field_final : 1 if sort_direction == "asc" else -1 } } { "$sort": { sort_field_final : 1 if sort_direction == "asc" else -1 } }
]) ])
return render_template(template, **locals()) return render_template(template, **locals())

16
inventory-app/templates/inventory_filter.html
View File

@@ -58,22 +58,6 @@
</label> </label>
</div> </div>
{% endif %} {% endif %}
{% if not public_view %}
<div class="input-field col s12 m2">
<label>
<input type="checkbox" value="true"
name="owner_disabled" {% if owner_disabled %} checked="checked" {% endif %}/>
<span>Owner disabled</span>
</label>
</div>
<div class="input-field col s12 m2">
<label>
<input type="checkbox" value="true"
name="user_disabled" {% if user_disabled %} checked="checked" {% endif %}/>
<span>User disabled</span>
</label>
</div>
{% endif %}
<div class="input-field col s12 m2" name="item_type"> <div class="input-field col s12 m2" name="item_type">
<button type="submit">Apply</button> <button type="submit">Apply</button>
<button type="reset">Reset</button> <button type="reset">Reset</button>