Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix slash in url: use alias_id instead of alias

This commit is contained in:
Son NK 2020-01-11 21:48:21 +01:00
parent 47bf6646fc
commit f860471d50
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/dashboard/templates/dashboard/alias_log.html
View File

@ -133,8 +133,12 @@
<nav aria-label="Alias log navigation"> <nav aria-label="Alias log navigation">
<ul class="pagination"> <ul class="pagination">
<li class="page-item {% if page_id == 0 %}disabled{% endif %}"><a class="page-link" href="{{ url_for('dashboard.alias_log', alias=alias, page_id=page_id-1) }}">Previous</a></li> <li class="page-item {% if page_id == 0 %}disabled{% endif %}">
<li class="page-item {% if last_page %}disabled{% endif %}"><a class="page-link" href="{{ url_for('dashboard.alias_log', alias=alias, page_id=page_id+1) }}">Next</a></li> <a class="page-link" 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="page-link" href="{{ url_for('dashboard.alias_log', alias_id=alias_id, page_id=page_id+1) }}">Next</a>
</li>
</ul> </ul>
</nav> </nav>
{% endblock %} {% endblock %}

2
app/dashboard/templates/dashboard/index.html
View File

@ -111,7 +111,7 @@
<span class="alias-activity">{{ alias_info.nb_forward }}</span> forwards, <span class="alias-activity">{{ alias_info.nb_forward }}</span> forwards,
<span class="alias-activity">{{ alias_info.nb_blocked }}</span> blocks, <span class="alias-activity">{{ alias_info.nb_blocked }}</span> blocks,
<span class="alias-activity">{{ alias_info.nb_reply }}</span> replies <span class="alias-activity">{{ alias_info.nb_reply }}</span> replies
<a href="{{ url_for('dashboard.alias_log', alias=gen_email.email) }}" <a href="{{ url_for('dashboard.alias_log', alias_id=gen_email.id) }}"
class="btn btn-sm btn-link"> class="btn btn-sm btn-link">
See All Activity &nbsp;→ See All Activity &nbsp;→
</a> </a>

10
app/dashboard/views/alias_log.py
View File

@ -22,11 +22,13 @@ class AliasLog:
setattr(self, k, v) setattr(self, k, v)
@dashboard_bp.route("/alias_log/<alias>", methods=["GET"], defaults={"page_id": 0}) @dashboard_bp.route(
@dashboard_bp.route("/alias_log/<alias>/<int:page_id>") "/alias_log/<int:alias_id>", methods=["GET"], defaults={"page_id": 0}
)
@dashboard_bp.route("/alias_log/<int:alias_id>/<int:page_id>")
@login_required @login_required
def alias_log(alias, page_id): def alias_log(alias_id, page_id):
gen_email = GenEmail.get_by(email=alias) gen_email = GenEmail.get(alias_id)
# sanity check # sanity check
if not gen_email: if not gen_email: