0001-variables-use-first-field-with-a-value-in-case-of-du.patch

Frédéric Péters, 24 janvier 2020 13:45

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

Subject: [PATCH] variables: use first field with a value in case of duplicated
 varnames (#38961)

 tests/test_formdata.py | 23 +++++++++++++++++++++++
 wcs/variables.py       |  8 ++++++++
 2 files changed, 31 insertions(+)

         assert lazy_formdata.tracking_code == tracking_code.id
     def test_lazy_formdata_duplicated_varname(pub, variable_test_data):
         formdef = FormDef.select()[0]
         formdata = FormDef.select()[0].data_class().select()[0]
         lazy_formdata = LazyFormData(formdata)
         assert lazy_formdata.var.foo_foo == 'bar'
         formdef.fields.append(fields.StringField(id='100', label='string', varname='foo_foo'))
         formdef.store()
         formdata = FormDef.select()[0].data_class().select()[0]
         lazy_formdata = LazyFormData(formdata)
         assert lazy_formdata.var.foo_foo == 'bar'
         # add a value to 2nd field with foo_foo as varname
         formdata.data['100'] = 'baz'
         lazy_formdata = LazyFormData(formdata)
         assert lazy_formdata.var.foo_foo == 'bar'  # 1st value
         # remove value from 1st field with foo_foo as varname
         formdata.data['0'] = None
         lazy_formdata = LazyFormData(formdata)
         assert lazy_formdata.var.foo_foo == 'baz'  # 2nd value
     def test_lazy_formdata_queryset(pub, variable_test_data):
         lazy_formdata = variable_test_data
         data_class = lazy_formdata._formdef.data_class()

             for field in self._fields:
                 if not field.varname:
                     continue
                 if field.varname in self._varnames:
                     # duplicated varname
                     value = self._data.get(self._varnames[field.varname].id)
                     if value or value is False:
                         # previous field had a value (not None or the empty string),
                         # stay on it.
                         continue
                     # else continue and update _varnames with new field reference.
                 self._varnames[field.varname] = field
             return self._varnames
+    -

Produits Entr'ouvert » w.c.s.