0001-api-include-URL-for-files-in-block-fields-50993.patch

Frédéric Péters, 03 août 2022 00:18

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

Subject: [PATCH] api: include URL for files in block fields (#50993)

 tests/form_pages/test_block.py | 14 +++++++++++---
 wcs/fields.py                  |  7 +++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

     from wcs.workflows import Workflow
     from ..utilities import clean_temporary_pub, create_temporary_pub, get_app, login
     from .test_all import create_user
     from .test_all import create_user, create_user_and_admin
     def pytest_generate_tests(metafunc):
-...
         block.name = 'foobar'
         block.fields = [
             fields.StringField(id='123', required=True, label='Test', type='string'),
             fields.FileField(id='234', required=True, label='Test2', type='file'),
             fields.FileField(id='234', required=True, label='Test2', type='file', varname='test2'),
+        ]
         block.store()
-...
         formdef.name = 'form title'
         formdef.fields = [
             fields.PageField(id='0', label='1st page', type='page'),
             fields.BlockField(id='1', label='test', type='block:foobar', max_items=3),
             fields.BlockField(id='1', label='test', type='block:foobar', max_items=3, varname='block'),
             fields.PageField(id='2', label='2nd page', type='page'),
+        ]
         formdef.store()
         formdef.data_class().wipe()
         app = get_app(pub)
         resp = app.get(formdef.get_url())
-...
         assert '>foo2<' in resp
         assert 'test2.txt' in resp
         # check they appear in API
         create_user_and_admin(pub)
         app = login(get_app(pub), username='admin', password='admin')
         resp = app.get(formdef.get_api_url() + 'list?full=on')
         assert app.get(resp.json[0]['fields']['block_raw'][0]['test2']['url']).body == b'foobar1'
         assert app.get(resp.json[0]['fields']['block_raw'][1]['test2']['url']).body == b'foobar2'
     @pytest.mark.parametrize('removed_line', [0, 1, 2])
     def test_block_repeated_remove_line(pub, removed_line):

         def get_json_value(self, value, formdata=None, include_file_content=True, **kwargs):
             out = value.get_json_value(include_file_content=include_file_content)
             if formdata:
                 out['url'] = self.get_download_url(formdata, **kwargs)
                 out['url'] = self.get_download_url(formdata, file_value=value, **kwargs)
             out['field_id'] = self.id
             return out
-...
             for subvalue_data in value.get('data'):
                 result.append(
                     FormData.get_json_data_dict(
                         subvalue_data, self.block.fields, include_files=kwargs.get('include_file_content')
                         subvalue_data,
                         self.block.fields,
                         formdata=kwargs.get('formdata'),
                         include_files=kwargs.get('include_file_content'),
+                    )
+                )
             return result
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-api-include-URL-for-files-in-block-fields-50993.patch