diff --git a/files/routes/hats.py b/files/routes/hats.py index 6e82c02f6..2f2321bc1 100644 --- a/files/routes/hats.py +++ b/files/routes/hats.py @@ -160,16 +160,10 @@ def hat_owners(v, hat_id): page = get_page() - users = g.db.query(User).join(Hat.owners).filter(Hat.hat_id == hat_id) + users = g.db.query(User, Hat.created_utc).join(Hat.owners).filter(Hat.hat_id == hat_id) total = users.count() users = users.order_by(Hat.created_utc.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE).all() - return render_template("user_cards.html", - v=v, - users=users, - total=total, - page=page, - user_cards_title="Hat Owners", - ) + return render_template("owners.html", v=v, users=users, page=page, total=total, kind="Hat") diff --git a/files/routes/users.py b/files/routes/users.py index b339a57c7..0a180e685 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -1396,19 +1396,14 @@ def bid_list(v, bid): page = get_page() - users = g.db.query(User).join(User.badges).filter(Badge.badge_id==bid) + users = g.db.query(User, Badge.created_utc).join(User.badges).filter(Badge.badge_id==bid) total = users.count() users = users.order_by(Badge.created_utc.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE).all() - return render_template("user_cards.html", - v=v, - users=users, - total=total, - page=page, - user_cards_title="Badge Owners", - ) + return render_template("owners.html", v=v, users=users, page=page, total=total, kind="Badge") + KOFI_TOKEN = environ.get("KOFI_TOKEN", "").strip() if KOFI_TOKEN: diff --git a/files/templates/owners.html b/files/templates/owners.html new file mode 100644 index 000000000..c5979ac69 --- /dev/null +++ b/files/templates/owners.html @@ -0,0 +1,26 @@ +{% extends "default.html" %} +{% block pagetitle %}{{kind}} Owners{% endblock %} +{% block content %} +
{{kind}} Owners
+
+ + + + + + +{% for user, created_utc in users %} + + + + +{% endfor %} + +
NameOwned since +
{% include "user_in_table.html" %} 1599343262 %}data-time="{{created_utc}}"{% endif %}>
+ +{% endblock %} + +{% block pagenav %} +{% include "pagination.html" %} +{% endblock %}