From 3a676e0b5afdd2e08d5d56cf12d4264a05771972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Tue, 23 May 2023 09:05:30 +0800 Subject: [PATCH] Fixed the back URL of the creation forms, applying the accounting_or_next filter for the decoded next URI instead of getting the next URI directly. --- src/accounting/templates/accounting/account/create.html | 2 +- src/accounting/templates/accounting/currency/create.html | 2 +- .../templates/accounting/journal-entry/disbursement/create.html | 2 +- .../templates/accounting/journal-entry/receipt/create.html | 2 +- .../templates/accounting/journal-entry/transfer/create.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/accounting/templates/accounting/account/create.html b/src/accounting/templates/accounting/account/create.html index 7824f5e..739603e 100644 --- a/src/accounting/templates/accounting/account/create.html +++ b/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 %}{{ request.args.get("next") or url_for("accounting.account.list") }}{% endblock %} +{% block back_url %}{{ url_for("accounting.account.list")|accounting_or_next }}{% endblock %} {% block action_url %}{{ url_for("accounting.account.store") }}{% endblock %} diff --git a/src/accounting/templates/accounting/currency/create.html b/src/accounting/templates/accounting/currency/create.html index 8f99c33..3460e54 100644 --- a/src/accounting/templates/accounting/currency/create.html +++ b/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 %}{{ request.args.get("next") or url_for("accounting.currency.list") }}{% endblock %} +{% block back_url %}{{ url_for("accounting.currency.list")|accounting_or_next }}{% endblock %} {% block action_url %}{{ url_for("accounting.currency.store") }}{% endblock %} diff --git a/src/accounting/templates/accounting/journal-entry/disbursement/create.html b/src/accounting/templates/accounting/journal-entry/disbursement/create.html index ba06adc..8f5b1b3 100644 --- a/src/accounting/templates/accounting/journal-entry/disbursement/create.html +++ b/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 %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %} +{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %} {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %} diff --git a/src/accounting/templates/accounting/journal-entry/receipt/create.html b/src/accounting/templates/accounting/journal-entry/receipt/create.html index 700f5c4..3356824 100644 --- a/src/accounting/templates/accounting/journal-entry/receipt/create.html +++ b/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 %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %} +{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %} {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %} diff --git a/src/accounting/templates/accounting/journal-entry/transfer/create.html b/src/accounting/templates/accounting/journal-entry/transfer/create.html index b5adc63..d6679e1 100644 --- a/src/accounting/templates/accounting/journal-entry/transfer/create.html +++ b/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 %}{{ request.args.get("next") or url_for("accounting-report.default") }}{% endblock %} +{% block back_url %}{{ url_for("accounting-report.default")|accounting_or_next }}{% endblock %} {% block action_url %}{{ url_for("accounting.journal-entry.store", journal_entry_type=journal_entry_type) }}{% endblock %}