workflows: respect parameter order in actions (#34155)

This commit is contained in:
Frédéric Péters 2019-06-19 16:12:52 +02:00
parent 73958864d1
commit 3d59e8e891
1 changed files with 1 additions and 7 deletions

View File

@ -2125,7 +2125,7 @@ class CommentableWorkflowStatusItem(WorkflowStatusItem):
def fill_admin_form(self, form):
if self.by and not type(self.by) is list:
self.by = None
self.add_parameters_widgets(form, self.get_parameters())
return super(self, CommentableWorkflowStatusItem).fill_admin_form(form)
def get_parameters(self):
return ('label', 'button_label', 'hint', 'by', 'varname',
@ -2366,9 +2366,6 @@ class SendmailWorkflowStatusItem(WorkflowStatusItem):
def get_parameters(self):
return ('to', 'subject', 'body', 'attachments', 'custom_from', 'condition')
def fill_admin_form(self, form):
self.add_parameters_widgets(form, self.get_parameters())
def add_parameters_widgets(self, form, parameters, prefix='', formdef=None):
super(SendmailWorkflowStatusItem, self).add_parameters_widgets(
form, parameters, prefix=prefix, formdef=formdef)
@ -2556,9 +2553,6 @@ class SendSMSWorkflowStatusItem(WorkflowStatusItem):
sms_mode = get_cfg('sms', {}).get('mode') or 'none'
return sms_mode != 'none'
def fill_admin_form(self, form):
self.add_parameters_widgets(form, self.get_parameters())
def get_parameters(self):
return ('to', 'body', 'condition')