Changeset 13159

Timestamp:

10 Jul 2015, 11:33:03 (9 years ago)

Author:

Henrik Bettermann

Message:

Enable import of list-of-choices fields.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/hostels/batching.py (modified) (1 diff)
• src/waeup/kofa/utils/batching.py (modified) (1 diff)
• src/waeup/kofa/utils/tests/test_converters.py (modified) (2 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.3.2.dev0 (unreleased)
 =======================
+
+* Enable import of list-of-choices fields.
 
 * Include 'end day' when searching for payments in a given period.

main/waeup.kofa/trunk/src/waeup/kofa/hostels/batching.py

@@ -68 +68 @@
         """Update obj to the values given in row.
         """
-        changed = []
-        for key, value in row.items():
-            # Skip fields to be ignored.
-            if value == IGNORE_MARKER:
-                continue
-            if not hasattr(obj, key):
-                continue
-            try:
-                evalvalue = eval(value)
-                if isinstance(evalvalue, list):
-                    value = evalvalue
-            except:
-                pass
-            setattr(obj, key, value)
-            log_value = getattr(value, 'code', value)
-            changed.append('%s=%s' % (key, log_value))
-
+        items_changed = super(HostelProcessor, self).updateEntry(
+            obj, row, site, filename)
         # Log actions...
         location_field = self.location_fields[0]
-        items_changed = ', '.join(changed)
         grok.getSite()['hostels'].logger.info(
             '%s - %s - %s - updated: %s'

main/waeup.kofa/trunk/src/waeup/kofa/utils/batching.py

@@ -221 +221 @@
             if not hasattr(obj, key):
                 continue
+            # DefaultObjectConverter.fromStringDict fails for
+            # list-of-choices fields because we are using a different
+            # widget for this combination. Thus the ListFieldConverter
+            # returns a useless dictionary which causes getWidgetsData to
+            # skip the field. The value in row remains unchanged. 
+            # We have to evaluate the string and replace the value here.
+            try:
+                evalvalue = eval(value)
+                if isinstance(evalvalue, list):
+                    value = evalvalue
+            except:
+                pass
             try:
                 setattr(obj, key, value)

main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_converters.py

@@ -98 +98 @@
         default = [],
         )
+    fav_colors = schema.List(
+        title = u'Favourite colors',
+        value_type = schema.Choice(
+            vocabulary = colors
+            ),
+        required = True,
+        default = [],
+        )
     friends = schema.List(
         title = u'Friends',
@@ -405 +413 @@
         return
 
+    def test_list_of_choices(self):
+        # We cannot handle lists of choices because we are using
+        # a widget which is not yet supported.
+        converter = IObjectConverter(IContact)
+        err, inv_err, data = converter.fromStringDict(
+            {"fav_colors": "['red', 'green']"}, 'contact')
+        self.assertEqual(
+            data, {})
+        return
+
     def test_ignore_values(self):
         # in update mode we ignore marked values