0001-datasources-avoid-raising-on-lost-datasource-18431.patch

Nicolas Roche, 10 octobre 2019 13:37

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

Subject: [PATCH] datasources: avoid raising on lost datasource (#18431)

 tests/test_form_pages.py | 19 +++++++++++++++++++
 wcs/data_sources.py      | 13 +++++++++----
 wcs/fields.py            |  2 ++
 wcs/formdef.py           |  6 +++---
 wcs/forms/common.py      |  2 ++
 5 files changed, 35 insertions(+), 7 deletions(-)

         resp = resp.forms[0].submit('submit')
         assert 'Check values then click submit.' in resp.body
     def test_unknown_datasource(pub):
         formdef = create_formdef()
         formdef.fields = [
             fields.StringField(id='1', label='string',
                     varname='string', required=False, data_source={'type': 'foobar'}),
             fields.ItemField(id='2', label='item',
                     varname='item', required=False, data_source={'type': 'foobar'}),
             fields.ItemsField(id='3', label='items',
                     varname='items', required=False, data_source={'type': 'foobar'}),
+        ]
         formdef.store()
         data_class = formdef.data_class()
         data_class.wipe()
         resp = get_app(pub).get('/test/')
         formdef.data_class().wipe()
         resp = resp.forms[0].submit('submit') # should go straight to validation
         assert 'Check values then click submit.' in resp.body
     def test_form_items_datasource(pub):
         formdef = create_formdef()
         formdef.fields = [fields.ItemsField(id='1', label='items',

     def get_items(data_source, include_disabled=False, mode=None):
         structured_items = get_structured_items(data_source, mode=mode)
         structured_items = get_structured_items(data_source, mode=mode) or []
         tupled_items = []
         for item in structured_items:
             if item.get('disabled') and not include_disabled:
-...
         if data_source.get('type') not in ('json', 'jsonp', 'formula'):
             # named data source
             named_data_source = NamedDataSource.get_by_slug(data_source['type'])
             if not named_data_source:
                 return
             if named_data_source.cache_duration:
                 cache_duration = int(named_data_source.cache_duration)
             data_source = named_data_source.data_source
-...
             return data_source
         if ds_type and ds_type.startswith('carddef:'):
             return data_source
         return NamedDataSource.get_by_slug(ds_type).data_source
         named_data_source = NamedDataSource.get_by_slug(ds_type)
         return named_data_source.data_source if named_data_source else None
     def get_object(data_source):
-...
             objects = [x for x in cls.select() if x.slug == slug]
             if objects:
                 return objects[0]
             raise KeyError("data source '%s' does not exist" % slug)
             get_logger().warn("data source '%s' does not exist" % slug)
             return None
         def get_json_query_url(self):
             url = self.data_source.get('value').strip()
-...
     class DataSourcesSubstitutionProxy(object):
         def __getattr__(self, attr):
             return get_structured_items(NamedDataSource.get_by_slug(attr).data_source)
             named_data_source = NamedDataSource.get_by_slug(attr)
             return get_structured_items(named_data_source.data_source) if named_data_source else []

         def perform_more_widget_changes(self, form, kwargs, edit=True):
             if self.data_source:
                 real_data_source = data_sources.get_real(self.data_source)
                 if not real_data_source:
                     return
                 if real_data_source.get('type') == 'jsonp':
                     kwargs['url'] = real_data_source.get('value')
                     self.widget_class = AutocompleteStringWidget

                         live_condition_fields[varname].append(field)
                 if field.key == 'item' and field.data_source:
                     real_data_source = data_sources.get_real(field.data_source)
                     if not real_data_source:
                         continue
                     if real_data_source.get('type') != 'json':
                         continue
                     varnames = field.get_referenced_varnames(
-...
             for field in formdef.fields:
                 data_source = getattr(field, 'data_source', None)
                 if data_source:
                     try:
                         data_sources.get_real(data_source)
                     except KeyError:
                     if not data_sources.get_real(data_source):
                         unknown_datasources.add(data_source.get('type'))
             if unknown_datasources:
                 raise FormdefImportError(N_('Unknown datasources'),

             for field in displayed_fields:
                 if field.key == 'item' and field.data_source:
                     data_source = data_sources.get_object(field.data_source)
                     if not data_source:
                         continue
                     if data_source.type != 'json':
                         continue
                     varnames = field.get_referenced_varnames(
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-datasources-avoid-raising-on-lost-datasource-18431.patch