From b3e18d547d0eb50b6dcfb4f200dc4ca2e3aa5c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Mon, 17 Aug 2020 22:27:54 +0800 Subject: [PATCH] Replaced the get_absolute_url() method in the account data model with the get_success_url() method in the account form model, and added the current application to the arguments to enable multiple instances of the application in the accounting application. --- accounting/models.py | 6 ------ accounting/views.py | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/accounting/models.py b/accounting/models.py index 0086f9a..fbfd852 100644 --- a/accounting/models.py +++ b/accounting/models.py @@ -18,14 +18,12 @@ """The data models of the accounting application. """ -import datetime from typing import Dict, List, Optional from dirtyfields import DirtyFieldsMixin from django.conf import settings from django.db import models, transaction from django.db.models import Q, Max -from django.urls import reverse from mia_core.utils import get_multi_lingual_attr, set_multi_lingual_attr, \ new_pk @@ -83,10 +81,6 @@ class Account(DirtyFieldsMixin, models.Model): super().save(force_insert=force_insert, force_update=force_update, using=using, update_fields=update_fields) - def get_absolute_url(self): - """REturns the """ - return reverse("accounting:accounts.detail", args=(self,)) - class Meta: db_table = "accounting_accounts" diff --git a/accounting/views.py b/accounting/views.py index 99639b5..ac2ac36 100644 --- a/accounting/views.py +++ b/accounting/views.py @@ -979,6 +979,11 @@ class AccountFormView(FormView): """Returns the current object, or None on a create form.""" return self.kwargs.get("account") + def get_success_url(self) -> str: + """Returns the URL on success.""" + return reverse("accounting:accounts.detail", args=(self.get_object(),), + current_app=self.request.resolver_match.namespace) + @require_POST @login_required