From da35765f86e47b331caff08baf1b16500daf191f Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Wed, 4 Oct 2017 09:09:29 +0200 Subject: [PATCH 1/2] workflow: re-order export to model UI and code (#19188) --- wcs/wf/export_to_model.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/wcs/wf/export_to_model.py b/wcs/wf/export_to_model.py index 341c1bd3..df765007 100644 --- a/wcs/wf/export_to_model.py +++ b/wcs/wf/export_to_model.py @@ -274,6 +274,15 @@ class ExportToModel(WorkflowStatusItem): return 'opendocument' raise UploadValidationError(_('Only RTF and OpenDocument files can be used')) + def get_parameters(self): + parameters = ('method', 'by', 'label', 'model_file', 'attach_to_history', + 'backoffice_info_text', 'varname') + if transform_to_pdf is not None: + parameters += ('convert_to_pdf',) + if has_portfolio(): + parameters += ('push_to_portfolio',) + return parameters + def add_parameters_widgets(self, form, parameters, prefix='', formdef=None): methods = collections.OrderedDict( @@ -309,22 +318,22 @@ class ExportToModel(WorkflowStatusItem): form.add(UploadWidget, widget_name, directory='models', filename=filename, title=_('Model'), hint=hint, validation=self.model_file_validation, value=value) - if 'attach_to_history' in parameters: - form.add(CheckboxWidget, '%sattach_to_history' % prefix, - title=_('Attach generated file to the form history'), - value=self.attach_to_history) if 'convert_to_pdf' in parameters: form.add(CheckboxWidget, '%sconvert_to_pdf' % prefix, title=_('Convert generated file to PDF'), value=self.convert_to_pdf) - if 'push_to_portfolio' in parameters: - form.add(CheckboxWidget, '%spush_to_portfolio' % prefix, - title=_('Push generated file to portfolio'), - value=self.push_to_portfolio) + if 'attach_to_history' in parameters: + form.add(CheckboxWidget, '%sattach_to_history' % prefix, + title=_('Attach generated file to the form history'), + value=self.attach_to_history) if 'varname' in parameters: form.add(VarnameWidget, '%svarname' % prefix, title=_('Identifier'), value=self.varname, hint=_('This is used to get generated document in expressions.')) + if 'push_to_portfolio' in parameters: + form.add(CheckboxWidget, '%spush_to_portfolio' % prefix, + title=_('Push generated file to portfolio'), + value=self.push_to_portfolio) if 'method' in parameters: form.add(RadiobuttonsWidget, '%smethod' % prefix, @@ -470,15 +479,6 @@ class ExportToModel(WorkflowStatusItem): outstream.seek(0) return outstream - def get_parameters(self): - parameters = ('method', 'by', 'label', 'model_file', 'attach_to_history', - 'backoffice_info_text', 'varname') - if transform_to_pdf is not None: - parameters += ('convert_to_pdf',) - if has_portfolio(): - parameters += ('push_to_portfolio',) - return parameters - def model_file_export_to_xml(self, xml_item, charset, include_id=False): if not self.model_file: return -- 2.14.2