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

Stopped merging non-field errors into the ID errors, and joined ID errors into the non-field errors in the record form in the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-08-08 10:57:32 +08:00
parent 05dd0e61a0
commit 5833af83a9
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
accounting/forms.py
View File

@ -85,6 +85,8 @@ class RecordForm(forms.Form):
ValidationError: When the validation fails. ValidationError: When the validation fails.
""" """
errors = [] errors = []
if "id" in self.errors:
errors = errors + self.errors["id"].as_data()
validators = [self._validate_transaction, validators = [self._validate_transaction,
self._validate_account_type, self._validate_account_type,
self._validate_is_credit] self._validate_is_credit]
@ -106,20 +108,16 @@ class RecordForm(forms.Form):
return return
if self.transaction is None: if self.transaction is None:
if "id" in self.data: if "id" in self.data:
error = forms.ValidationError( raise forms.ValidationError(
_("This record is not for this transaction."), _("This record is not for this transaction."),
code="not_belong") code="not_belong")
self.add_error("id", error)
raise error
else: else:
if "id" in self.data: if "id" in self.data:
record = Record.objects.get(pk=self.data["id"]) record = Record.objects.get(pk=self.data["id"])
if record.transaction.pk != self.transaction.pk: if record.transaction.pk != self.transaction.pk:
error = forms.ValidationError( raise forms.ValidationError(
_("This record is not for this transaction."), _("This record is not for this transaction."),
code="not_belong") code="not_belong")
self.add_error("id", error)
raise error
def _validate_account_type(self): def _validate_account_type(self):
"""Validates whether the account is a correct debit or credit account. """Validates whether the account is a correct debit or credit account.
@ -158,15 +156,13 @@ class RecordForm(forms.Form):
record = Record.objects.get(pk=self.data["id"]) record = Record.objects.get(pk=self.data["id"])
if record.is_credit != self.is_credit: if record.is_credit != self.is_credit:
if self.is_credit: if self.is_credit:
error = forms.ValidationError( raise forms.ValidationError(
_("This record is not a credit record."), _("This record is not a credit record."),
code="not_credit") code="not_credit")
else: else:
error = forms.ValidationError( raise forms.ValidationError(
_("This record is not a debit record."), _("This record is not a debit record."),
code="not_debit") code="not_debit")
self.add_error("id", error)
raise error
class TransactionForm(forms.Form): class TransactionForm(forms.Form):