0001-datasources-avoid-error-500-on-lost-datasource-18431.patch

Nicolas Roche, 10 octobre 2019 09:10

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

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

 tests/test_form_pages.py | 20 ++++++++++++++++++
 wcs/fields.py            | 45 ++++++++++++++++++++++++++++------------
 wcs/formdef.py           |  5 ++++-
 wcs/forms/common.py      |  5 ++++-
 4 files changed, 60 insertions(+), 15 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',

                 return [self.convert_value_to_str(element)]
             return [element]
         def call_data_source(self, fonction, **kwargs):
             try:
                 return fonction(self.data_source, **kwargs)
             except KeyError as e:
                 get_logger().warn('%s from %s field on %s form'
                                   % (e, self.label, self.formdef.name))
                 return None
         def get_data_source_iter(self, fonction, **kwargs):
             try:
                 return fonction(self.data_source, **kwargs)
             except KeyError as e:
                 get_logger().warn('%s from %s field on %s form'
                                   % (e, self.label, self.formdef.name))
                 return []
     field_classes = []
     field_types = []
-...
         def perform_more_widget_changes(self, form, kwargs, edit=True):
             if self.data_source:
                 real_data_source = data_sources.get_real(self.data_source)
                 real_data_source = self.call_data_source(data_sources.get_real)
                 if not real_data_source:
                     return
                 if real_data_source.get('type') == 'jsonp':
                     kwargs['url'] = real_data_source.get('value')
                     self.widget_class = AutocompleteStringWidget
-...
         def get_options(self, mode=None):
             if self.data_source:
                 return [x[:3] for x in data_sources.get_items(self.data_source, mode=mode)]
                 return [x[:3] for x in self.get_data_source_iter(data_sources.get_items, mode=mode)]
             if self.items:
                 return [(x, x) for x in self.items]
             return []
         def perform_more_widget_changes(self, form, kwargs, edit=True):
             data_source = data_sources.get_object(self.data_source)
             data_source = self.call_data_source(data_sources.get_object)
             if data_source and data_source.type == 'jsonp':
                 # a source defined as JSONP can only be used in autocomplete mode
-...
             if self.items:
                 kwargs['options'] = self.get_options()
             elif self.data_source:
                 items = data_sources.get_items(self.data_source,
                 items = self.get_data_source_iter(data_sources.get_items,
                         include_disabled=self.display_disabled_items)
                 kwargs['options'] = [x[:3] for x in items if not x[-1].get('disabled')]
                 kwargs['options_with_attributes'] = items[:]
-...
                 kwargs['select2'] = True
         def get_display_value(self, value):
             data_source = data_sources.get_object(self.data_source)
             data_source = self.call_data_source(data_sources.get_object)
             if data_source is None:
                 return value or ''
-...
         def store_display_value(self, data, field_id):
             value = data.get(field_id)
             data_source = data_sources.get_object(self.data_source)
             data_source = self.call_data_source(data_sources.get_object)
             if data_source and data_source.type == 'jsonp':
                 if get_request():
                     display_value = get_request().form.get('f%s_display' % field_id)
-...
             return self.get_display_value(value)
         def store_structured_value(self, data, field_id):
             data_source = data_sources.get_object(self.data_source)
             data_source = self.call_data_source(data_sources.get_object)
             if data_source is None:
                 return
-...
             return item_items_stats(self, values)
         def feed_session(self, value, display_value):
             real_data_source = data_sources.get_real(self.data_source)
             real_data_source = self.call_data_source(data_sources.get_real)
             if real_data_source and real_data_source.get('type') == 'jsonp':
                 if not get_session().jsonp_display_values:
                     get_session().jsonp_display_values = {}
-...
         def export_to_json(self, include_id=False, anonymise=True):
             field = super(ItemField, self).export_to_json(include_id=include_id, anonymise=anonymise)
             if self.data_source and not anonymise:
                 structured_items = data_sources.get_structured_items(self.data_source)
                 structured_items = self.call_data_source(data_sources.get_structured_items)
                 if structured_items:
                     field['structured_items'] = structured_items
                     if not field.get('items'):
-...
             if self.data_source:
                 if self._cached_data_source:
                     return self._cached_data_source
                 self._cached_data_source = [x[:3] for x in data_sources.get_items(self.data_source)]
                 self._cached_data_source = [x[:3]
                         for x in self.get_data_source_iter(data_sources.get_items)]
                 return self._cached_data_source[:]
             elif self.items:
                 return [(x, x) for x in self.items]
-...
             kwargs['options'] = self.get_options()
             kwargs['max_choices'] = self.max_choices
             if self.data_source:
                 items = data_sources.get_items(self.data_source,
                 items = self.get_data_source_iter(data_sources.get_items,
                         include_disabled=self.display_disabled_items)
                 kwargs['options'] = [x[:3] for x in items if not x[-1].get('disabled')]
                 kwargs['options_with_attributes'] = items[:]
-...
             value = data.get(field_id)
             if not self.data_source:
                 return
             structured_options = data_sources.get_structured_items(self.data_source)
             structured_options = self.call_data_source(data_sources.get_structured_items)
             if not structured_options:
                 return
             if not set(structured_options[0].keys()) != set(['id', 'text']):
-...
         def export_to_json(self, include_id=False, anonymise=True):
             field = super(ItemsField, self).export_to_json(include_id=include_id, anonymise=True)
             if self.data_source and not anonymise:
                 structured_items = data_sources.get_structured_items(self.data_source)
                 structured_items = self.call_data_source(data_sources.get_structured_items)
                 if structured_items:
                     field['structured_items'] = structured_items
                     if not field.get('items'):

                             live_condition_fields[varname] = []
                         live_condition_fields[varname].append(field)
                 if field.key == 'item' and field.data_source:
                     real_data_source = data_sources.get_real(field.data_source)
                     try:
                         real_data_source = data_sources.get_real(field.data_source)
                     except KeyError as e:
                         continue
                     if real_data_source.get('type') != 'json':
                         continue
                     varnames = field.get_referenced_varnames(

             for field in displayed_fields:
                 if field.key == 'item' and field.data_source:
                     data_source = data_sources.get_object(field.data_source)
                     try:
                         data_source = data_sources.get_object(field.data_source)
                     except KeyError as e:
                         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-error-500-on-lost-datasource-18431.patch