simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2025-02-24 07:43:54 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add missing last_page check (index) Move disabled class to correct element (alias_log)

Browse source
This commit is contained in:
Sibren Vasse 2020-05-14 13:50:17 +02:00
parent cb269a1bbe
commit e44d92705c
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/dashboard/templates/dashboard/alias_log.html
View file

@ -145,12 +145,13 @@
<nav aria-label="Alias log navigation">
<ul class="pagination">
<li class="page-item {% if page_id == 0 %}disabled{% endif %}">
<a class="btn btn-outline-secondary"
<li class="page-item">
<a class="btn btn-outline-secondary {% if page_id == 0 %}disabled{% endif %}"
href="{{ url_for('dashboard.alias_log', alias_id=alias_id, page_id=page_id-1) }}">Previous</a>
</li>
<li class="page-item {% if last_page %}disabled{% endif %}">
<a class="btn btn-outline-secondary" href="{{ url_for('dashboard.alias_log', alias_id=alias_id, page_id=page_id+1) }}">Next</a>
<li class="page-item">
<a class="btn btn-outline-secondary {% if last_page %}disabled{% endif %}"
href="{{ url_for('dashboard.alias_log', alias_id=alias_id, page_id=page_id+1) }}">Next</a>
</li>
</ul>
</nav>

13
app/dashboard/views/index.py
View file

@ -6,6 +6,7 @@ from sqlalchemy.orm import joinedload
from app import alias_utils
from app.api.serializer import get_alias_infos_with_pagination_v2
from app.config import PAGE_LIMIT
from app.dashboard.base import dashboard_bp
from app.extensions import db
from app.log import LOG
@ -140,18 +141,24 @@ def index():
stats = get_stats(current_user)
alias_infos = get_alias_infos_with_pagination_v2(
current_user, page, query, sort, alias_filter
)
last_page = (
len(alias_infos) < PAGE_LIMIT
)
return render_template(
"dashboard/index.html",
client_users=client_users,
alias_infos=get_alias_infos_with_pagination_v2(
current_user, page, query, sort, alias_filter
),
alias_infos=alias_infos,
highlight_alias_id=highlight_alias_id,
query=query,
AliasGeneratorEnum=AliasGeneratorEnum,
mailboxes=mailboxes,
show_intro=show_intro,
page=page,
last_page=last_page,
sort=sort,
filter=alias_filter,
stats=stats,