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

Reordered the methods in FormView in the Mia core application.

Browse Source
This commit is contained in:
依瑪貓 2020-08-16 18:58:25 +08:00
parent 9c98cb70f4
commit 4f9c3e89c3
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mia_core/views.py
View File

@ -82,28 +82,6 @@ class FormView(View):
return self.form_invalid(form) return self.form_invalid(form)
return self.form_valid(form) return self.form_valid(form)
def form_invalid(self, form) -> HttpResponseRedirect:
"""Handles the action when the POST form is invalid"""
return stored_post.error_redirect(
self.request, self.get_error_url(), form.data)
def form_valid(self, form) -> HttpResponseRedirect:
"""Handles the action when the POST form is valid"""
obj = self.get_object()
if obj is None:
obj = self._model()
self._set_object(obj)
self.fill_model_from_form(obj, form)
if isinstance(obj, DirtyFieldsMixin)\
and not obj.is_dirty(check_relationship=True):
message = self.get_not_modified_message(form.cleaned_data)
else:
obj.save()
message = self.get_success_message(form.cleaned_data)
messages.success(self.request, message)
return redirect(str(UrlBuilder(self.get_success_url())
.query(r=self.request.GET.get("r"))))
def get_form_class(self) -> Type[forms.Form]: def get_form_class(self) -> Type[forms.Form]:
"""Returns the form class.""" """Returns the form class."""
if self.form_class is None: if self.form_class is None:
@ -168,6 +146,28 @@ class FormView(View):
for name in form.fields: for name in form.fields:
setattr(obj, name, form[name].value()) setattr(obj, name, form[name].value())
def form_invalid(self, form) -> HttpResponseRedirect:
"""Handles the action when the POST form is invalid"""
return stored_post.error_redirect(
self.request, self.get_error_url(), form.data)
def form_valid(self, form) -> HttpResponseRedirect:
"""Handles the action when the POST form is valid"""
obj = self.get_object()
if obj is None:
obj = self._model()
self._set_object(obj)
self.fill_model_from_form(obj, form)
if isinstance(obj, DirtyFieldsMixin)\
and not obj.is_dirty(check_relationship=True):
message = self.get_not_modified_message(form.cleaned_data)
else:
obj.save()
message = self.get_success_message(form.cleaned_data)
messages.success(self.request, message)
return redirect(str(UrlBuilder(self.get_success_url())
.query(r=self.request.GET.get("r"))))
def get_success_url(self) -> str: def get_success_url(self) -> str:
"""Returns the URL on success.""" """Returns the URL on success."""
if self.success_url is not None: if self.success_url is not None: