more bda.plone.shop related fieldnames

collective · Feb 18, 2015 · c70b847 · c70b847
1 parent 7fa01de
commit c70b847
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/collective/jsonify/wrapper.py b/collective/jsonify/wrapper.py
@@ -380,6 +380,12 @@ def get_archetypes_fields(self):
             if type_[0] == '_' and type_.endswith('ExtensionField'):
                 type_ = type_[1: -len('ExtensionField')] + 'Field'
 
+            string_fieldnames = [
+                'StringField',
+                'TextField',
+                'XStringField',   # from bda.plone.shop
+                'XTextField',     # from bda.plone.shop
+            ]
             fieldnames = [
                 'BooleanField',
                 'ComputedField',
@@ -390,19 +396,17 @@ def get_archetypes_fields(self):
                 'IntegerField',
                 'LinesField',
                 'SimpleDataGridField',
-                'StringField',
                 'TALESLines',
                 'TALESString',
-                'TextField',
                 'ZPTField',
                 'LeadimageCaptionField',  # from collective.contentleadimage
-                'XStringField',   # from bda.plone.shop
                 'XFloatField',    # from bda.plone.shop
                 'XBooleanField',  # from bda.plone.shop
-                'XTextField',     # from bda.plone.shop
+                'XSharedStockBooleanField',  # from bda.plone.ticketshop
+                'XSharedStockFloatField',    # from bda.plone.ticketshop
             ]
 
-            if type_ in fieldnames:
+            if type_ in string_fieldnames + fieldnames:
                 try:
                     value = field.getRaw(self.context)
                 except AttributeError:
@@ -415,7 +419,7 @@ def get_archetypes_fields(self):
                     if isinstance(value, str):
                         value = value.decode('utf-8')
 
-                if value and type_ in ['StringField', 'TextField']:
+                if value and type_ in string_fieldnames:
                     try:
                         value = self.decode(value)
                     except AttributeError:
@@ -434,7 +438,7 @@ def get_archetypes_fields(self):
 
                 self[unicode(fieldname)] = value
 
-                if value and type_ in ['TextField', 'StringField']:
+                if value and type_ in string_fieldnames:
                     try:
                         ct = field.getContentType(self.context)
                         self[unicode('_content_type_') + fieldname] = ct
@@ -444,6 +448,7 @@ def get_archetypes_fields(self):
             elif type_ in [
                 'DateTimeField',
                 'XDateTimeField',  # from bda.plone.shop
+                'XSharedBuyablePeriodDateTimeField',  # from bda.plone.ticketshop  # noqa
             ]:
                 value = str(self._get_at_field_value(field))
                 if value: