carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

better counter

master
Aevann 2024-11-08 21:38:21 +02:00
parent f4742727a8
commit 04a42899cc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/routes/groups.py
View File

@ -177,7 +177,9 @@ def memberships(v, group_name):
GroupMembership.user_id != group.owner_id,
)
total = members.count()
members = members.order_by(GroupMembership.is_mod.desc(), GroupMembership.approved_utc).offset(500 * (page - 1)).limit(500).all()
if page == 1: size = 499
else: size = 500
members = members.order_by(GroupMembership.is_mod.desc(), GroupMembership.approved_utc).offset(size * (page - 1)).limit(size).all()
if page == 1:
owner = [g.db.query(GroupMembership).join(GroupMembership.user).filter(
@ -192,7 +194,7 @@ def memberships(v, group_name):
GroupMembership.approved_utc == None
).order_by(GroupMembership.created_utc).all()
return render_template('group_memberships.html', v=v, group=group, members=members, applications=applications, page=page, total=total, size=500)
return render_template('group_memberships.html', v=v, group=group, members=members, applications=applications, page=page, total=total, size=size)
@app.post("/!<group_name>/<user_id>/approve")
@limiter.limit('1/second', scope=rpath)

4
files/templates/group_memberships.html
View File

@ -77,8 +77,8 @@
{% for membership in memberships %}
<tr id="{{membership.user_id}}">
{% set counter = loop.index %}
{% if name == 'members' and page > 1 %}
{% set counter = counter + (page - 1) * 500 + 1 %}
{% if name == 'members' %}
{% set counter = counter + (page - 1) * 500 %}
{% endif %}
<td id="counter-{{membership.user_id}}">{{counter}}</td>
{% set is_owner = membership.user_id == group.owner_id %}