0001-misc-allow-downloading-file-while-submitting-66460.patch

Frédéric Péters, 26 juin 2022 09:21

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

Subject: [PATCH] misc: allow downloading file while submitting (#66460)

 tests/form_pages/test_all.py                        |  7 ++++++-
 tests/form_pages/test_file_field.py                 |  2 +-
 wcs/forms/common.py                                 | 10 ++++++++--
 wcs/forms/root.py                                   |  4 ++--
 wcs/qommon/static/js/qommon.fileupload.js           |  7 ++++++-
 wcs/qommon/templates/qommon/forms/widgets/file.html |  5 ++++-
 wcs/root.py                                         |  1 +
 7 files changed, 28 insertions(+), 8 deletions(-)

         assert resp.location.startswith('http://example.net/test/?mt=')
         resp = resp.follow()
         resp = resp.forms[1].submit('previous')
         assert '<span class="filename">test.txt</span>' in resp.text
         assert resp.pyquery('.filename').text() == 'test.txt'
         # check file is downloadable
         r2 = resp.click('test.txt')
         assert r2.content_type == 'text/plain'
         assert r2.text == 'foobar'
         # check submitted form keeps the file
         resp = resp.forms[1].submit('submit')  # -> confirmation page
-...
         resp = resp.follow()
         resp = resp.follow()
         assert 'zob' in resp
         assert resp.click('test.txt').text == 'foobar'
         resp = resp.forms[1].submit('submit')  # -> validation
         resp = resp.forms[1].submit('submit')  # -> submission
         assert create_formdata['target_formdef'].data_class().count() == 1

         resp = resp.forms[0].submit('submit')
         assert 'Check values then click submit.' in resp.text
         assert '<img alt="" src="tempfile?' in resp.text
         tempfile_id = resp.text[resp.text.index('tempfile?') :].split('&', 1)[0].split('=')[1]
         tempfile_id = resp.pyquery('.fileinfo .filename a').attr.href.split('=')[1]
         resp_tempfile = app.get('/test/tempfile?t=%s' % tempfile_id)
         assert resp_tempfile.body == image_content

     class FormStatusPage(Directory, FormTemplateMixin):
         _q_exports_orig = ['', 'download', 'json', 'action', 'live']
         _q_exports_orig = ['', 'download', 'json', 'action', 'live', 'tempfile']
         _q_extra_exports = []
         form_page_class = None
-...
         def html_top(self, title=None):
             template.html_top(title=title, default_org=_('Forms'))
         def __init__(self, formdef, filled, register_workflow_subdirs=True, custom_view=None):
         def __init__(self, formdef, filled, register_workflow_subdirs=True, custom_view=None, parent_view=None):
             get_publisher().substitutions.feed(filled)
             self.formdef = formdef
             self.formdata = filled
             self.filled = filled
             self.custom_view = custom_view
             self.parent_view = parent_view
             self._q_exports = self._q_exports_orig[:]
             for q in self._q_extra_exports:
                 if q not in self._q_exports:
-...
                 anonymise=anonymise, include_files=get_query_flag('include-files-content', default=True)
+            )
         def tempfile(self):
             # allow for file uploaded via a file widget in a workflow form
             # to be downloaded back from widget
             return self.parent_view.tempfile()
         def workflow_messages(self, position='top'):
             if self.formdef.workflow:
                 workflow_messages = self.filled.get_workflow_messages(position=position, user=get_request().user)

             except KeyError:
                 raise errors.TraversalError()
             return self.get_status_page_class()(self.formdef, filled)
             return self.get_status_page_class()(self.formdef, filled, parent_view=self)
     class RootDirectory(AccessControlled, Directory):
-...
     class PublicFormStatusPage(FormStatusPage):
         _q_exports_orig = ['', 'download', 'status', 'live']
         _q_exports_orig = ['', 'download', 'status', 'live', 'tempfile']
         form_page_class = FormPage
         history_templates = ['wcs/front/formdata_history.html', 'wcs/formdata_history.html']
         status_templates = ['wcs/front/formdata_status.html', 'wcs/formdata_status.html']

                         return;
+                    }
                     $(base_widget).find('.fileprogress').hide();
                     $(base_widget).find('.filename').text(data.result[0].name);
                     if (data.result[0].url) {
                         $(base_widget).find('.filename').empty().append(
                             $('<a>', {href: data.result[0].url, download: data.result[0].name, text: data.result[0].name}));
                     } else {
                         $(base_widget).find('.filename').text(data.result[0].name);
+                    }
                     $(base_widget).find('.fileinfo').show();
                     $(base_widget).find('input[type=hidden]').val(data.result[0].token);
                     $(base_widget).parents('form').find('div.buttons button').prop('disabled', false);

            data-error="{% trans "Error during upload." %}"></div>
     </div>
     <div class="fileinfo {% if widget.readonly and widget.has_tempfile_image %}thumbnail{% endif %}">
       <span class="filename">{{ widget.tempfile.base_filename }}</span>
       <span class="filename">{% if widget.tempfile %}<a
         href="tempfile?t={{ widget.tempfile.token }}"
         download="{{widget.tempfile.base_filename}}"
         >{{ widget.tempfile.base_filename }}</a>{% endif %}</span>
     {% if not widget.readonly %}
       <a href="#" role="button" class="remove" title="{% trans 'Remove this file' %}">{% trans "remove" %}</a>
     {% elif widget.has_tempfile_image %}

wcs/root.py
328	328	'type': tempfile.get('content_type'),
329	329	'size': tempfile.get('size'),
330	330	'token': tempfile.get('token'),
	331	'url': 'tempfile?t=%s' % tempfile.get('token'),
331	332	}
332	333	)
333	334	except UploadStorageError as e:
334		-

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-allow-downloading-file-while-submitting-66460.patch