0001-workflows-store-attachment-references-as-templates-6.patch

Frédéric Péters, 20 juin 2022 10:13

Voir les différences: en ligne côte à côte

Subject: [PATCH] workflows: store attachment references as templates (#66398)

 tests/admin_pages/test_workflow.py | 38 ++++++++++++++++++++++--------
 wcs/workflows.py                   | 19 ++++++++++++---
 2 files changed, 44 insertions(+), 13 deletions(-)

         resp = app.get(item_url)
         assert "Attachments" in resp.text
         assert "Attachments (templates or Python expressions)" not in resp.text
         assert resp.form['attachments$element0$choice'].value == 'form_var_upload_raw'
         assert resp.form['attachments$element0$choice'].value == '{{form_var_upload_raw}}'
         assert len(resp.form['attachments$element0$choice'].options) == 5
         resp = resp.form.submit('attachments$add_element')  # add one
         resp.form['attachments$element1$choice'] = 'form_var_upload2_raw'
         resp.form['attachments$element1$choice'] = '{{form_var_upload2_raw}}'
         resp = resp.form.submit('submit')
         assert resp.location
         sendmail = Workflow.get(workflow.id).get_status(st1.id).items[0]
         assert sendmail.attachments == ['form_var_upload_raw', 'form_var_upload2_raw']
         assert sendmail.attachments == ['{{form_var_upload_raw}}', '{{form_var_upload2_raw}}']
         resp = app.get(item_url)
         resp = resp.form.submit('attachments$add_element')  # add one
         resp.form['attachments$element2$choice'] = 'form_fbo3_3x'
         resp.form['attachments$element2$choice'] = '{{form_fbo3_3x}}'
         resp = resp.form.submit('submit')
         assert resp.location
         sendmail = Workflow.get(workflow.id).get_status(st1.id).items[0]
         assert sendmail.attachments == ['form_var_upload_raw', 'form_var_upload2_raw', 'form_fbo3_3x']
         assert sendmail.attachments == ['{{form_var_upload_raw}}', '{{form_var_upload2_raw}}', '{{form_fbo3_3x}}']
         resp = app.get(item_url)
         resp = resp.form.submit('attachments$add_element')  # add one
-...
         assert resp.location
         sendmail = Workflow.get(workflow.id).get_status(st1.id).items[0]
         assert sendmail.attachments == [
             '{{form_var_upload_raw}}',
             '{{form_var_upload2_raw}}',
             '{{form_fbo3_3x}}',
             '{"content":"foo", "filename":"bar.txt"}',
+        ]
         # check old attachments python expressions are converted to templates
         workflow.refresh_from_storage()
         workflow.get_status(st1.id).items[0].attachments = [
             'form_var_upload_raw',
             'form_var_upload2_raw',
             'form_fbo3_3x',
             '{"content":"foo", "filename":"bar.txt"}',
+        ]
         workflow.store()
         resp = app.get(item_url)
         resp = resp.form.submit('submit')
         sendmail = Workflow.get(workflow.id).get_status(st1.id).items[0]
         assert sendmail.attachments == [
             '{{form_var_upload_raw}}',
             '{{form_var_upload2_raw}}',
             '{"content":"foo", "filename":"bar.txt"}',
+        ]
-...
         assert resp.location
         sendmail = Workflow.get(workflow.id).get_status(st1.id).items[0]
         assert sendmail.attachments == [
             'form_var_upload_raw',
             'form_var_upload2_raw',
             '{{form_var_upload_raw}}',
             '{{form_var_upload2_raw}}',
             '{"content":"foo", "filename":"bar.txt"}',
+        ]
         # remove all backoffice fields
         workflow = Workflow.get(workflow.id)
         workflow.backoffice_fields_formdef.fields = []
-...
         assert resp.location
         sendmail = Workflow.get(workflow.id).get_status(st1.id).items[0]
         assert sendmail.attachments == [
             'form_var_upload_raw',
             'form_var_upload2_raw',
             '{{form_var_upload_raw}}',
             '{{form_var_upload2_raw}}',
             '{"content":"foo", "filename":"bar.txt"}',
+        ]

                 if any(x for x in attribute_value if isinstance(x, int)):
                     setattr(self, roles_attribute, [str(x) for x in attribute_value])
                     changed = True
             if getattr(self, 'attachments', None):
                 if any(x for x in self.attachments if not x.startswith('{{')):
                     # convert old attachment python expression to templates
                     for field in self.parent.parent.get_backoffice_fields():
                         if field.key != 'file':
                             continue
                         if field.varname:
                             codename = 'form_var_%s_raw' % field.varname
                         else:
                             codename = 'form_f%s' % field.id.replace('-', '_')  # = form_fbo<...>
                         if codename in self.attachments:
                             changed = True
                             self.attachments = ['{{%s}}' % x if x == codename else x for x in self.attachments]
             return changed
         def render_as_line(self):
-...
                 if field.key != 'file':
                     continue
                 if field.varname:
                     codename = 'form_var_%s_raw' % field.varname
                     codename = '{{form_var_%s_raw}}' % field.varname
                 else:
                     codename = 'form_f%s' % field.id.replace('-', '_')  # = form_fbo<...>
                     codename = '{{form_f%s}}' % field.id.replace('-', '_')  # = form_fbo<...>
                     varnameless.append(codename)
                 attachments_options.append((codename, field.label, codename))
             # filter: do not consider removed fields without varname
             attachments = [
                 attachment
                 for attachment in self.attachments or []
                 if ((not attachment.startswith('form_fbo')) or (attachment in varnameless))
                 if ((not attachment.startswith('{{form_fbo')) or (attachment in varnameless))
+            ]
             return attachments_options, attachments
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-store-attachment-references-as-templates-6.patch