mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Various cleanups in generic views

Browse Source
This commit is contained in:
Karl Hobley 2017-09-29 12:08:14 +01:00 committed by Matt Westcott
parent 8a028fbe38
commit e83eb0b32b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wagtail/wagtailadmin/views/generic.py
View File

@ -88,7 +88,7 @@ class CreateView(PermissionCheckedMixin, TemplateResponseMixin, BaseCreateView):
return None
return self.success_message.format(instance)
def get_error_message(self, instance):
def get_error_message(self):
if self.error_message is None:
return None
return self.error_message
@ -111,7 +111,8 @@ class CreateView(PermissionCheckedMixin, TemplateResponseMixin, BaseCreateView):
return redirect(self.get_success_url())
def form_invalid(self, form):
error_message = self.get_error_message(self.object)
self.form = form
error_message = self.get_error_message()
if error_message is not None:
messages.error(self.request, error_message)
return super(CreateView, self).form_invalid(form)
@ -156,12 +157,12 @@ class EditView(PermissionCheckedMixin, TemplateResponseMixin, BaseUpdateView):
"""
return self.form.save()
def get_success_message(self, instance):
def get_success_message(self):
if self.success_message is None:
return None
return self.success_message.format(instance)
return self.success_message.format(self.object)
def get_error_message(self, instance):
def get_error_message(self):
if self.error_message is None:
return None
return self.error_message
@ -169,7 +170,7 @@ class EditView(PermissionCheckedMixin, TemplateResponseMixin, BaseUpdateView):
def form_valid(self, form):
self.form = form
self.object = self.save_instance()
success_message = self.get_success_message(self.object)
success_message = self.get_success_message()
if success_message is not None:
messages.success(self.request, success_message, buttons=[
messages.button(reverse(self.edit_url_name, args=(self.object.id,)), _('Edit'))
@ -177,7 +178,8 @@ class EditView(PermissionCheckedMixin, TemplateResponseMixin, BaseUpdateView):
return redirect(self.get_success_url())
def form_invalid(self, form):
error_message = self.get_error_message(self.object)
self.form = form
error_message = self.get_error_message()
if error_message is not None:
messages.error(self.request, error_message)
return super(EditView, self).form_invalid(form)
@ -215,12 +217,12 @@ class DeleteView(PermissionCheckedMixin, TemplateResponseMixin, BaseDeleteView):
def get_delete_url(self):
return reverse(self.delete_url_name, args=(self.object.id,))
def get_success_message(self, instance):
def get_success_message(self):
if self.success_message is None:
return None
return self.success_message.format(instance)
return self.success_message.format(self.object)
def delete(self, request, *args, **kwargs):
response = super(DeleteView, self).delete(request, *args, **kwargs)
messages.success(request, self.success_message.format(self.object))
messages.success(request, self.get_success_message())
return response