diff options
Diffstat (limited to '')
| -rw-r--r-- | webmentions_ssg/views/sources.py | 22 | ||||
| -rw-r--r-- | webmentions_ssg/views/user.py | 5 |
2 files changed, 16 insertions, 11 deletions
diff --git a/webmentions_ssg/views/sources.py b/webmentions_ssg/views/sources.py index 1c9cc58..84b98fb 100644 --- a/webmentions_ssg/views/sources.py +++ b/webmentions_ssg/views/sources.py @@ -183,11 +183,10 @@ def rescan_sources() -> ResponseReturnValue: manual_scan_sources() flash("Source rescan queued.", "success") - query_args: dict[str, str | int] = dict(filters) page = request.args.get("page", 1, type=int) - if page > 1: - query_args["page"] = page - return redirect(url_for("webmentions.source_list", **query_args)) + return redirect( + url_for("webmentions.source_list", page=page if page > 1 else None, **filters) + ) @webmentions_bp.route("/sources/<uuid:source_uuid>") @@ -256,11 +255,14 @@ def resend_webmention( flash(f"Webmention {webmention.uuid} queued for resend.", "success") - detail_args: dict[str, str | int] = dict(filters) - for name in ("page", "source_page"): - page = request.args.get(name, 1, type=int) - if page > 1: - detail_args[name] = page + page = request.args.get("page", 1, type=int) + source_page = request.args.get("source_page", 1, type=int) return redirect( - url_for("webmentions.source_detail", source_uuid=source_uuid, **detail_args) + url_for( + "webmentions.source_detail", + source_uuid=source_uuid, + page=page if page > 1 else None, + source_page=source_page if source_page > 1 else None, + **filters, + ) ) diff --git a/webmentions_ssg/views/user.py b/webmentions_ssg/views/user.py index 4675ade..ec253c4 100644 --- a/webmentions_ssg/views/user.py +++ b/webmentions_ssg/views/user.py @@ -25,7 +25,10 @@ def user_page() -> ResponseReturnValue: if form.validate_on_submit(): user = cast(User, current_user._get_current_object()) if not user.check_password(form.current_password.data or ""): - form.current_password.errors.append("Current password is incorrect.") + form.current_password.errors = [ + *form.current_password.errors, + "Current password is incorrect.", + ] else: user.password = form.new_password.data or "" db.session.commit() |
