external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(routers.accounts): correct disable decision for More button

Browse source 
Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-12-26 18:35:38 -08:00
parent 2baf061b96
commit b27dab99d8
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aurweb/routers/accounts.py
View file

@ -529,7 +529,6 @@ async def accounts_post(request: Request,
# Get a query handle to users, populate the total user
# count into a jinja2 context variable.
query = db.query(models.User).join(models.AccountType)
context["total_users"] = query.count()
# Populate this list with any additional statements to
# be ANDed together.
@ -551,8 +550,10 @@ async def accounts_post(request: Request,
if statements:
query = query.filter(and_(*statements))
context["total_users"] = query.count()
# Finally, order and truncate our users for the current page.
users = query.order_by(*order_by).limit(pp).offset(offset)
users = query.order_by(*order_by).limit(pp).offset(offset).all()
context["users"] = util.apply_all(users, db.refresh)
return render_template(request, "account/index.html", context)

6
templates/partials/account/results.html
View file

@ -64,11 +64,11 @@
<input type="hidden" name="O"
value="{{ offset + pp }}" />
{% for k, v in params.items() %}
<input type="hidden" name="{{ k }}"
value="{{ v }}" />
<input type="hidden" name="{{ k }}" value="{{ v }}" />
{% endfor %}
<button type="submit" class="button page-next"
{% if offset + pp >= total_users %}
{% if (offset + pp) >= total_users %}
disabled
{% endif %}
>