0001-fields-show-hint-on-blocks-only-once-45686.patch

Thomas Noël, 03 août 2020 15:21

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

Subject: [PATCH] fields: show hint on blocks only once (#45686)

 tests/test_form_pages.py | 8 ++++++--
 wcs/blocks.py            | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

         formdef = FormDef()
         formdef.name = 'form title'
         formdef.fields = [
             fields.BlockField(id='1', label='test', type='block:foobar'),
             fields.BlockField(id='1', label='test', type='block:foobar', hint='hintblock'),
+        ]
         formdef.store()
         app = get_app(pub)
         resp = app.get(formdef.get_url())
         assert resp.text.count('>hintblock<') == 1
         resp.form['f1$element0$f123'] = 'foo'
         resp.form['f1$element0$f234'] = 'bar'
         resp = resp.form.submit('submit')  # -> validation page
-...
         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, hint='hintblock'),
             fields.PageField(id='2', label='2nd page', type='page'),
+        ]
         formdef.store()
-...
         app = get_app(pub)
         resp = app.get(formdef.get_url())
         assert resp.text.count('>Test<') == 1
         assert resp.text.count('>hintblock<') == 1
         assert 'Add another' in resp
         resp = resp.form.submit('f1$add_element')
         assert resp.text.count('>Test<') == 2
         assert resp.text.count('>hintblock<') == 1
         resp = resp.form.submit('f1$add_element')
         assert resp.text.count('>Test<') == 3
         assert resp.text.count('>hintblock<') == 1
         assert 'Add another' not in resp
         # fill items (1st and 3rd row)

                 element_values = value.get('data')
             if not max_items:
                 max_items = 1
             hint = kwargs.pop('hint', None)
             element_kwargs = {'block': self.block, 'render_br': False}
             element_kwargs.update(kwargs)
             super().__init__(
-...
                 element_type=BlockSubWidget,
                 element_kwargs=element_kwargs,
                 add_element_label=add_element_label or _('Add another'),
                 hint=hint,
                 **kwargs,
+            )
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-fields-show-hint-on-blocks-only-once-45686.patch