mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 17:36:49 +01:00
Code Issues Releases Wiki Activity

move modal form rendering into its own helper method

Browse Source
This commit is contained in:
Matt Westcott 2020-07-23 00:16:45 +01:00 committed by Matt Westcott
parent 2ec9886cb1
commit 336f5a75c5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wagtail/admin/views/pages.py
View File

@ -1328,16 +1328,7 @@ class WorkflowAction(View):
redirect_to = self.task.on_action(self.task_state, request.user, self.action_name, **form.cleaned_data) or self.redirect_to
elif self.action_modal and request.is_ajax():
# show form errors
return render_modal_workflow(
request, 'wagtailadmin/pages/workflow_action_modal.html', None, {
'page': self.page,
'form': form,
'action': self.action_name,
'action_verbose': self.action_verbose_name,
'task_state': self.task_state,
},
json_data={'step': 'action'}
)
return self.render_modal_form(request, form)
else:
redirect_to = self.task.on_action(self.task_state, request.user, self.action_name) or self.redirect_to
@ -1347,6 +1338,9 @@ class WorkflowAction(View):
def get(self, request, page_id, action_name, task_state_id):
form = self.form_class()
return self.render_modal_form(request, form)
def render_modal_form(self, request, form):
return render_modal_workflow(
request, 'wagtailadmin/pages/workflow_action_modal.html', None, {
'page': self.page,