0001-misc-remove-fields-blocks-site-option-57260.patch

Lauréline Guérin, 24 septembre 2021 15:54

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

Subject: [PATCH 1/5] misc: remove fields-blocks site option (#57260)

 tests/admin_pages/test_block.py         | 16 ++++-----
 tests/backoffice_pages/test_carddata.py |  2 +-
 tests/conftest.py                       |  5 ---
 tests/form_pages/test_block.py          | 48 ++++++++++++-------------
 tests/test_formdata.py                  |  2 +-
 tests/test_snapshots.py                 |  2 +-
 tests/workflow/test_all.py              |  2 +-
 wcs/admin/forms.py                      |  3 +-
 wcs/admin/settings.py                   |  3 +-
 wcs/backoffice/cards.py                 |  3 +-
 wcs/fields.py                           |  4 +--
 wcs/qommon/publisher.py                 |  1 -
 12 files changed, 40 insertions(+), 51 deletions(-)

         clean_temporary_pub()
     def test_block_404(pub, blocks_feature):
     def test_block_404(pub):
         create_superuser(pub)
         create_role(pub)
         BlockDef.wipe()
-...
         app.get('/backoffice/forms/blocks/1/', status=404)
     def test_block_new(pub, blocks_feature):
     def test_block_new(pub):
         create_superuser(pub)
         create_role(pub)
         BlockDef.wipe()
-...
         assert str(BlockDef.get(1).fields[0].id) != '1'  # don't use integers
     def test_block_options(pub, blocks_feature):
     def test_block_options(pub):
         create_superuser(pub)
         BlockDef.wipe()
         block = BlockDef()
-...
         resp = resp.follow()
     def test_block_options_digest_template(pub, blocks_feature):
     def test_block_options_digest_template(pub):
         create_superuser(pub)
         BlockDef.wipe()
         block = BlockDef()
-...
         assert block.digest_template == 'X{{foobar_var_foo}}Y'
     def test_block_export_import(pub, blocks_feature):
     def test_block_export_import(pub):
         create_superuser(pub)
         BlockDef.wipe()
         block = BlockDef()
-...
         assert 'Invalid File' in resp
     def test_block_delete(pub, blocks_feature):
     def test_block_delete(pub):
         create_superuser(pub)
         BlockDef.wipe()
         FormDef.wipe()
-...
         assert 'This block is still used' in resp
     def test_block_edit_duplicate_delete_field(pub, blocks_feature):
     def test_block_edit_duplicate_delete_field(pub):
         create_superuser(pub)
         BlockDef.wipe()
         block = BlockDef()
-...
         assert len(BlockDef.get(block.id).fields) == 1
     def test_block_use_in_formdef(pub, blocks_feature):
     def test_block_use_in_formdef(pub):
         create_superuser(pub)
         FormDef.wipe()
         BlockDef.wipe()

         assert pub.loggederror_class.select()[0].get_formdata().data == {'1': 'plop'}
     def test_block_card_item_link(pub, blocks_feature):
     def test_block_card_item_link(pub):
         user = create_user(pub)
         CardDef.wipe()
         carddef = CardDef()

         return site_options(request, pub, 'options', 'welco_url', 'http://welco.example.net')
     @pytest.fixture
     def blocks_feature(request, pub):
         return site_options(request, pub, 'options', 'fields-blocks', 'true')
     @pytest.fixture
     def emails():
         with EmailsMocking() as mock:

         clean_temporary_pub()
     def test_block_simple(pub, blocks_feature):
     def test_block_simple(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert '>bar<' in resp
     def test_block_required(pub, blocks_feature):
     def test_block_required(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert 'Check values then click submit.' in resp.text
     def test_block_required_previous_page(pub, blocks_feature):
     def test_block_required_previous_page(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
             assert formdata.data['1']['data'] == [{'123': 'foo', '234': 'bar'}, {'123': 'foo2', '234': 'bar2'}]
     def test_block_date(pub, blocks_feature):
     def test_block_date(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert '>2020-06-16<' in resp
     def test_block_bool(pub, blocks_feature):
     def test_block_bool(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
                 assert '<div class="value">No</div>' in resp
     def test_block_autocomplete_list(pub, blocks_feature):
     def test_block_autocomplete_list(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert '>Bar<' in resp
     def test_block_geoloc_prefill(pub, blocks_feature):
     def test_block_geoloc_prefill(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert resp.html.find('div', {'data-geolocation': 'road'})
     def test_block_string_prefill(pub, blocks_feature):
     def test_block_string_prefill(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
             assert resp.form['f3$element0$f123'].value == 'Foobar'
     def test_block_prefill_and_required(pub, blocks_feature):
     def test_block_prefill_and_required(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert formdata.data['3']['data'][0]['234'] is True
     def test_block_locked_prefill(pub, blocks_feature):
     def test_block_locked_prefill(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert resp.form['fxxx_3$element0$f123'].value == 'foo@localhost'
     def test_block_title_and_comment(pub, blocks_feature):
     def test_block_title_and_comment(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         resp = resp.follow()
     def test_block_label(pub, blocks_feature):
     def test_block_label(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert 'Block Label' not in resp.text
     def test_block_multipage(pub, blocks_feature):
     def test_block_multipage(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert '>bar<' in resp
     def test_block_repeated(pub, blocks_feature):
     def test_block_repeated(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert '>bar2<' in resp
     def test_block_repeated_over_limit(pub, blocks_feature):
     def test_block_repeated_over_limit(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert 'Too many elements (maximum: 2)' in resp
     def test_block_repeated_files(pub, blocks_feature):
     def test_block_repeated_files(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
     @pytest.mark.parametrize('removed_line', [0, 1, 2])
     def test_block_repeated_remove_line(pub, blocks_feature, removed_line):
     def test_block_repeated_remove_line(pub, removed_line):
         FormDef.wipe()
         BlockDef.wipe()
-...
     @pytest.mark.parametrize('block_name', ['foobar', 'Foo bar'])
     def test_block_digest(pub, blocks_feature, block_name):
     def test_block_digest(pub, block_name):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert formdef.data_class().select()[0].data['1_display'] == 'XfooY, Xfoo2Y'
     def test_block_digest_item(pub, blocks_feature):
     def test_block_digest_item(pub):
         FormDef.wipe()
         BlockDef.wipe()
         NamedDataSource.wipe()
-...
         assert formdef.data_class().select()[0].data['1_display'] == 'XunY, XdeuxY'
     def test_block_post_condition_on_2nd_page(pub, blocks_feature):
     def test_block_post_condition_on_2nd_page(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
     @mock.patch('wcs.qommon.misc.urlopen')
     def test_block_with_dynamic_item_field(mock_urlopen, pub, blocks_feature):
     def test_block_with_dynamic_item_field(mock_urlopen, pub):
         def data_source(url):
             url, query = url.split('?q=')
             payload = []
-...
         assert resp.form['f2'].value == '1'
     def test_block_used_in_later_prefill(pub, blocks_feature):
     def test_block_used_in_later_prefill(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         assert resp.form['f3'].value == '9'
     def test_block_add_and_locked_field(pub, blocks_feature):
     def test_block_add_and_locked_field(pub):
         FormDef.wipe()
         BlockDef.wipe()
-...
         resp = resp.form.submit('submit')  # -> submit
     def test_block_subfields_display_locations(pub, blocks_feature):
     def test_block_subfields_display_locations(pub):
         FormDef.wipe()
         BlockDef.wipe()

         assert variables['form'].parent is not None
     def test_block_variables(pub, blocks_feature):
     def test_block_variables(pub):
         BlockDef.wipe()
         FormDef.wipe()

         assert 'Can not restore snapshot (Unknown datasources [unknown])' in resp
     def test_block_snapshot_browse(pub, blocks_feature):
     def test_block_snapshot_browse(pub):
         create_superuser(pub)
         create_role(pub)

         formdata.store()
     def test_set_backoffice_field_block(two_pubs, blocks_feature):
     def test_set_backoffice_field_block(two_pubs):
         BlockDef.wipe()
         Workflow.wipe()
         FormDef.wipe()

                 r += htmltext('<span class="actions">')
                 if is_global_accessible('forms'):
                     r += htmltext('<a href="data-sources/">%s</a>') % _('Data sources')
                     if get_publisher().has_site_option('fields-blocks'):
                         r += htmltext('<a href="blocks/">%s</a>') % _('Fields blocks')
                     r += htmltext('<a href="blocks/">%s</a>') % _('Fields blocks')
                     if get_publisher().get_backoffice_root().is_accessible('categories'):
                         r += htmltext('<a href="categories/">%s</a>') % _('Categories')
                 r += htmltext('<a href="import" rel="popup">%s</a>') % _('Import')

             if StudioDirectory.is_visible():
                 form.add(CheckboxWidget, 'carddefs', title=_('Card Models'), value=True)
             form.add(CheckboxWidget, 'workflows', title=_('Workflows'), value=True)
             if get_publisher().has_site_option('fields-blocks'):
                 form.add(CheckboxWidget, 'blockdefs', title=_('Fields Blocks'), value=True)
             form.add(CheckboxWidget, 'blockdefs', title=_('Fields Blocks'), value=True)
             if not get_cfg('sp', {}).get('idp-manage-roles'):
                 form.add(CheckboxWidget, 'roles', title=_('Roles'), value=True)
             form.add(CheckboxWidget, 'categories', title=_('Categories'), value=True)

             r += htmltext('<span class="actions">')
             if get_publisher().get_backoffice_root().is_global_accessible('forms'):
                 r += htmltext('<a href="../forms/data-sources/">%s</a>') % _('Data sources')
                 if get_publisher().has_site_option('fields-blocks'):
                     r += htmltext('<a href="../forms/blocks/">%s</a>') % _('Fields blocks')
                 r += htmltext('<a href="../forms/blocks/">%s</a>') % _('Fields blocks')
             if get_publisher().get_backoffice_root().is_global_accessible('cards'):
                 r += htmltext('<a href="categories/">%s</a>') % _('Categories')
             r += htmltext('<a href="import" rel="popup">%s</a>') % _('Import')

             # add computed field in its own "section"
             options.extend([('', '—', ''), (ComputedField.key, ComputedField.description, ComputedField.key)])
         if get_publisher().has_site_option('fields-blocks') and (
             not blacklisted_types or 'blocks' not in blacklisted_types
         ):
         if not blacklisted_types or 'blocks' not in blacklisted_types:
             position = len(options)
             for blockdef in BlockDef.select(order_by='name'):
                 options.append(('block:%s' % blockdef.slug, blockdef.name, 'block:%s' % blockdef.slug))

                 'studio': True,
                 'mail-templates': True,
                 'external-workflow': True,
                 'fields-blocks': True,
                 'complex-data': True,
+            }
             if self.site_options is None:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-remove-fields-blocks-site-option-57260.patch