imacat/mia-accounting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 41 Wiki Activity

Added the __get_detail_uri and __get_list_uri functions to the "accounting.account.views" module, for simplicity.

Browse Source
This commit is contained in:
依瑪貓 2023-02-27 16:29:56 +08:00
parent 952061c4bb
commit 515d39e61c
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/accounting/account/views.py
View File

@ -87,8 +87,7 @@ def add_account() -> redirect:
db.session.add(account) db.session.add(account)
db.session.commit() db.session.commit()
flash(lazy_gettext("The account is added successfully"), "success") flash(lazy_gettext("The account is added successfully"), "success")
return redirect(inherit_next(url_for("accounting.account.detail", return redirect(inherit_next(__get_detail_uri(account)))
account=account)))
@bp.get("/<account:account>", endpoint="detail") @bp.get("/<account:account>", endpoint="detail")
@ -140,14 +139,12 @@ def update_account(account: Account) -> redirect:
form.populate_obj(account) form.populate_obj(account)
if not account.is_modified: if not account.is_modified:
flash(lazy_gettext("The account was not modified."), "success") flash(lazy_gettext("The account was not modified."), "success")
return redirect(inherit_next(url_for("accounting.account.detail", return redirect(inherit_next(__get_detail_uri(account)))
account=account)))
account.updated_by_id = get_current_user_pk() account.updated_by_id = get_current_user_pk()
account.updated_at = sa.func.now() account.updated_at = sa.func.now()
db.session.commit() db.session.commit()
flash(lazy_gettext("The account is updated successfully."), "success") flash(lazy_gettext("The account is updated successfully."), "success")
return redirect(inherit_next(url_for("accounting.account.detail", return redirect(inherit_next(__get_detail_uri(account)))
account=account)))
@bp.post("/<account:account>/delete", endpoint="delete") @bp.post("/<account:account>/delete", endpoint="delete")
@ -163,7 +160,7 @@ def delete_account(account: Account) -> redirect:
sort_accounts_in(account.base_code, account.id) sort_accounts_in(account.base_code, account.id)
db.session.commit() db.session.commit()
flash(lazy_gettext("The account is deleted successfully."), "success") flash(lazy_gettext("The account is deleted successfully."), "success")
return redirect(or_next(url_for("accounting.account.list"))) return redirect(or_next(__get_list_uri()))
@bp.get("/bases/<baseAccount:base>", endpoint="order") @bp.get("/bases/<baseAccount:base>", endpoint="order")
@ -190,7 +187,24 @@ def sort_accounts(base: BaseAccount) -> redirect:
form.save_order() form.save_order()
if not form.is_modified: if not form.is_modified:
flash(lazy_gettext("The order was not modified."), "success") flash(lazy_gettext("The order was not modified."), "success")
return redirect(or_next(url_for("accounting.account.list"))) return redirect(or_next(__get_list_uri()))
db.session.commit() db.session.commit()
flash(lazy_gettext("The order is updated successfully."), "success") flash(lazy_gettext("The order is updated successfully."), "success")
return redirect(or_next(url_for("accounting.account.list"))) return redirect(or_next(__get_list_uri()))
def __get_detail_uri(account: Account) -> str:
"""Returns the detail URI of an account.
:param account: The account.
:return: The detail URI of the account.
"""
return url_for("accounting.account.detail", account=account)
def __get_list_uri() -> str:
"""Returns the account list URI.
:return: The account list URI.
"""
return url_for("accounting.account.list")