docs/source/changelog.rst

@@ -2,17 +2,6 @@ Change Log
 ==========
 
 
-Version 1.5.6
--------------
-
-Released 2023/5/23
-
-Bug fixes.
-
-* Fixed the return URI of the creation forms to decode the next URI.
-* Fixed the unmatched offset list to use the encoded next URI.
-
-
 Version 1.5.5
 -------------
 

src/accounting/__init__.py

@@ -24,7 +24,7 @@ from flask_sqlalchemy import SQLAlchemy
 
 from accounting.utils.user import UserUtilityInterface
 
-VERSION: str = "1.5.6"
+VERSION: str = "1.5.5"
 """The package version."""
 db: SQLAlchemy = SQLAlchemy()
 """The database instance."""

src/accounting/templates/accounting/account/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/1
 
 {% block header %}{% block title %}{{ A_("Add a New Account") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting.account.list")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting.account.list") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.account.store") }}{% endblock %}

src/accounting/templates/accounting/currency/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/6
 
 {% block header %}{% block title %}{{ A_("Add a New Currency") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting.currency.list")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting.currency.list") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.currency.store") }}{% endblock %}

src/accounting/templates/accounting/journal-entry/disbursement/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Cash Disbursement Journal Entry") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %}

src/accounting/templates/accounting/journal-entry/receipt/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Cash Receipt Journal Entry") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %}

src/accounting/templates/accounting/journal-entry/transfer/create.html

@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Transfer Journal Entry") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %}

src/accounting/templates/accounting/report/unmatched.html

@@ -49,7 +49,7 @@ First written: 2023/4/17
 
   <form action="{{ url_for("accounting-report.match-offsets", currency=report.currency, account=report.account) }}" method="post">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-    <input type="hidden" name="next" value="{{ accounting_as_next() }}">
+    <input type="hidden" name="next" value="{{ request.full_path if request.query_string else request.path }}">
     <div class="modal fade" id="accounting-match-modal" tabindex="-1" aria-labelledby="accounting-match-modal-label" aria-hidden="true">
       <div class="modal-dialog">
         <div class="modal-content">

src/accounting/utils/next_uri.py

@@ -26,15 +26,6 @@ from flask import request, Blueprint, current_app
 from itsdangerous import URLSafeSerializer, BadData
 
 
-def __as_next() -> str:
-    """Encodes the current request URI as value for the next URI.
-
-    :return: The current request URI as value for the next URI.
-    """
-    return encode_next(
-        request.full_path if request.query_string else request.path)
-
-
 def append_next(uri: str) -> str:
     """Appends the current URI as the next URI to the query argument.
 
@@ -113,7 +104,6 @@ def init_app(bp: Blueprint) -> None:
     :param bp: The blueprint of the accounting application.
     :return: None.
     """
-    bp.add_app_template_global(__as_next, "accounting_as_next")
     bp.add_app_template_filter(append_next, "accounting_append_next")
     bp.add_app_template_filter(inherit_next, "accounting_inherit_next")
     bp.add_app_template_filter(or_next, "accounting_or_next")

tests/test_site/__init__.py

@@ -68,6 +68,7 @@ def create_app(is_testing: bool = False) -> Flask:
     db.init_app(app)
 
     app.register_blueprint(bp, url_prefix="/")
+    app.add_template_global(__as_next, "accounting_as_next")
 
     from . import locale
     locale.init_app(app)
@@ -148,3 +149,12 @@ def get_home() -> str:
     :return: The home page.
     """
     return render_template("home.html")
+
+
+def __as_next() -> str:
+    """Encodes the current request URI as value for the next URI.
+
+    :return: The current request URI as value for the next URI.
+    """
+    return encode_next(
+        request.full_path if request.query_string else request.path)