0001-cards-empty-digest-template-when-datasource-custom-v.patch

Lauréline Guérin, 20 octobre 2020 16:59

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

Subject: [PATCH] cards: empty digest template when datasource custom views
 (#46862)

 tests/test_cards_admin_pages.py | 64 +++++++++++++++++++++++++++++++++
 wcs/admin/forms.py              | 35 +++++++++++++++---
 2 files changed, 95 insertions(+), 4 deletions(-)

         resp = resp.form.submit('submit').follow()
     def test_card_digest_template(pub, studio):
         create_superuser(pub)
         CardDef.wipe()
         carddef = CardDef()
         carddef.name = 'foo'
         carddef.fields = [
             fields.StringField(id='1', label='Test', type='string', varname='foo'),
+        ]
         carddef.digest_template = 'X{{ form_var_foo }}Y'
         carddef.store()
         carddef.data_class().wipe()
         carddata = carddef.data_class()()
         carddata.data = {'1': 'bar'}
         carddata.store()
         # no custom view as datasource, it's ok to empty digest_template
         app = login(get_app(pub))
         resp = app.get('/backoffice/cards/%s/options/templates' % carddef.id)
         resp.form['digest_template'] = ''
         resp = resp.form.submit().follow()
         carddef = CardDef.get(carddef.id)
         assert carddef.digest_template is None
         assert 'Existing cards will be updated in the background.' in resp.text
         carddef.digest_template = '{{ form_var_foo }}'
         carddef.store()
         custom_view = pub.custom_view_class()
         custom_view.title = 'card view'
         custom_view.formdef = carddef
         custom_view.columns = {'list': [{'id': 'id'}]}
         custom_view.filters = {'filter-1': True, 'filter-1-value': 'FOO'}
         custom_view.visibility = 'any'
         custom_view.store()
         # no custom view as datasource, it's ok to empty digest_template
         app = login(get_app(pub))
         resp = app.get('/backoffice/cards/%s/options/templates' % carddef.id)
         resp.form['digest_template'] = ''
         resp = resp.form.submit().follow()
         carddef = CardDef.get(carddef.id)
         assert carddef.digest_template is None
         assert 'Existing cards will be updated in the background.' in resp.text
         carddef.digest_template = '{{ form_var_foo }}'
         carddef.store()
         # custom view as datasource, can not empty digest_template
         custom_view.visibility = 'datasource'
         custom_view.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/cards/%s/options/templates' % carddef.id)
         resp.form['digest_template'] = ''
         resp = resp.form.submit()
         assert 'Can not empty digest template: there are data source custom views.' in resp.text
         carddef = CardDef.get(carddef.id)
         assert carddef.digest_template is not None
         # error: not stored, and no after jobs
         resp = app.get('/backoffice/cards/%s/' % carddef.id)
         assert 'Existing cards will be updated in the background.' not in resp.text
     def test_card_custom_view_data_source(pub, studio):
         user = create_superuser(pub)
         Role.wipe()

     from wcs.qommon.afterjobs import AfterJob
     from wcs.formdef import FormDef, FormdefImportError, FormdefImportRecoverableError
     from wcs.carddef import CardDef
     from wcs.categories import Category
     from wcs.roles import Role, logged_users_role, get_user_roles
     from wcs.workflows import Workflow
-...
                     for formdata in self.formdef.data_class().select(order_by='id'):
                         formdata.store()
                 job = get_response().add_after_job(N_('Updating digests'), update)
                 get_session().message = ('info',
                         _('Existing forms will be updated in the background.'))
                 if isinstance(self.formdef, CardDef):
                     get_session().message = ('info',
                             _('Existing cards will be updated in the background.'))
                 else:
                     get_session().message = ('info',
                             _('Existing forms will be updated in the background.'))
             return result
         def handle(self, form, title):
-...
                 for attr in attrs:
                     widget = form.get_widget(attr)
                     if widget:
                         if hasattr(self, 'clean_%s' % attr):
                             has_error = getattr(self, 'clean_%s' % attr)(form)
                             if has_error:
                                 continue
                         if attr == 'geoloc_label':
                             if widget.parse():
                                 self.formdef.geolocations = {'base': widget.parse()}
-...
                             if getattr(self.formdef, attr, None) != new_value:
                                 self.changed = True
                                 setattr(self.formdef, attr, new_value)
                 self.formdef.store(comment=_('Changed "%s" parameters') % title)
                 return redirect('..')
                 if not form.has_errors():
                     self.formdef.store(comment=_('Changed "%s" parameters') % title)
                     return redirect('..')
             html_top('forms', title=self.formdef.name)
             r = TemplateIO(html=True)
-...
             r += form.render()
             return r.getvalue()
         def clean_digest_template(self, form):
             if not isinstance(self.formdef, CardDef):
                 return False
             widget = form.get_widget('digest_template')
             new_value = widget.parse()
             if new_value:
                 return False
             clauses = [Equal('formdef_type', 'carddef'), Equal('visibility', 'datasource')]
             custom_views = get_publisher().custom_view_class.count(clauses)
             if custom_views:
                 widget.set_error(_('Can not empty digest template: there are data source custom views.'))
                 return True
             return False
     class WorkflowRoleDirectory(Directory):
         def __init__(self, formdef):
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-cards-empty-digest-template-when-datasource-custom-v.patch