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

Added the cleaned_data argument to the get_not_modified_message and get_success_message methods in the FormView in the Mia core application.

Browse Source
This commit is contained in:
依瑪貓 2020-08-16 10:46:59 +08:00
parent 3794735df9
commit a7bb5d456a
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mia_core/views.py
View File

@ -97,10 +97,10 @@ class FormView(View):
self.fill_model_from_form(obj, form) self.fill_model_from_form(obj, form)
if isinstance(obj, DirtyFieldsMixin)\ if isinstance(obj, DirtyFieldsMixin)\
and not obj.is_dirty(check_relationship=True): and not obj.is_dirty(check_relationship=True):
message = self.get_not_modified_message() message = self.get_not_modified_message(form.cleaned_data)
else: else:
obj.save() obj.save()
message = self.get_success_message() message = self.get_success_message(form.cleaned_data)
messages.success(self.request, message) messages.success(self.request, message)
return redirect(str(UrlBuilder(self.get_success_url()) return redirect(str(UrlBuilder(self.get_success_url())
.query(r=self.request.GET.get("r")))) .query(r=self.request.GET.get("r"))))
@ -174,13 +174,27 @@ class FormView(View):
return self.error_url return self.error_url
return self.request.get_full_path() return self.request.get_full_path()
def get_not_modified_message(self) -> str: def get_not_modified_message(self, cleaned_data: Dict[str, str]) -> str:
"""Returns the message when the data was not modified.""" """Returns the message when the data was not modified.
return self.not_modified_message
def get_success_message(self) -> str: Args:
"""Returns the success message.""" cleaned_data: The cleaned data of the form.
return self.success_message
Returns:
The message when the data was not modified.
"""
return self.not_modified_message % cleaned_data
def get_success_message(self, cleaned_data: Dict[str, str]) -> str:
"""Returns the success message.
Args:
cleaned_data: The cleaned data of the form.
Returns:
The message when the data was not modified.
"""
return self.success_message % cleaned_data
def get_object(self) -> Optional[Model]: def get_object(self) -> Optional[Model]:
"""Finds and returns the current object, or None on a create form.""" """Finds and returns the current object, or None on a create form."""