improved Dexterity support

Solgema/fullcalendar/browser/adapters.py

@@ -1009,6 +1009,21 @@ def getEvents(self):
         return result
 
 
+def convert(value):
+    query = value['query']
+    if isinstance(query, unicode):
+        query = query.encode("utf-8")
+    elif isinstance(query, list):
+        query = [
+            item.encode("utf-8") if isinstance(item, unicode) else item
+            for item in query
+        ]
+    else:
+        pass
+    value['query'] = query
+    return value
+
+
 class DXCollectionEventSource(TopicEventSource):
     """Event source that get events from the collection
     """
@@ -1021,12 +1036,10 @@ def _getCriteriaArgs(self):
 
         listCriteria = context.query
 
-        # Handle operator-only query strings accordingly.
-        # Also convert to str since unicode breaks the catalog-query
-        query = dict(['v' in a and (str(a['i']),
-            [str(value) for value in a['v']]) or
-            (str(a['i']), [str(value) for value in a['o']])
-            for a in listCriteria])
+        query = dict([
+            (key, convert(value))
+            for key, value in queryparser.parseFormquery(context, listCriteria).items()
+        ])
 
         topicCriteria = interfaces.IListCriterias(context)()
         _args = {}

Solgema/fullcalendar/browser/views.py

@@ -691,7 +691,12 @@ def __call__(self):
         css = ''
         if not colorsDict or not availableSubFolders:
             return css
-        folderIds = [a.getId for a in self.context.getFolderContents(contentFilter={'object_provides':'Products.ATContentTypes.interfaces.folder.IATFolder'})]
+        folderIds = [a.getId for a in self.context.getFolderContents(contentFilter={
+            'object_provides': [
+                'Products.ATContentTypes.interfaces.folder.IATFolder',
+                'plone.dexterity.interfaces.IDexterityContainer',
+            ]
+        })]
         if not folderIds:
             return css
         fieldid = 'subFolders'

Solgema/fullcalendar/vocabularies.py

@@ -59,7 +59,12 @@ def availableCriterias( context ):
     return TitledVocabulary.fromTitles([(crit['id'], crit['title']) for crit in li])
 
 def availableSubFolders( context ):
-    folderContents = context.getFolderContents(contentFilter={'object_provides':'Products.ATContentTypes.interfaces.folder.IATFolder'})
+    folderContents = context.getFolderContents(contentFilter={
+        'object_provides': [
+            'Products.ATContentTypes.interfaces.folder.IATFolder',
+            'plone.dexterity.interfaces.IDexterityContainer',
+        ]
+    })
     return TitledVocabulary.fromTitles([(a.getId, a.Title) for a in folderContents])
 
 def shortNameFormats(context):

Solgema/fullcalendar/widgets/widgets.py

@@ -20,6 +20,11 @@ class ICollection(Interface): pass
 except:
     class IDXCollection(Interface): pass
 
+try:
+    from plone.dexterity.interfaces import IDexterityContainer
+except:
+    IDexterityContainer = IATFolder
+
 from Solgema.fullcalendar.interfaces import ICustomUpdatingDict, ISolgemaFullcalendarProperties, IListBaseQueryCriteria
 from Solgema.fullcalendar import msg_fact as _
 
@@ -58,6 +63,8 @@ def render(self):
             fieldname = index.friendlyName or index.index
             if selectedItems:
                 html += '<br/><b>%s</b><br/><table>' % (fieldname)
+                if isinstance(selectedItems, unicode):
+                    selectedItems = [selectedItems]
                 for item in selectedItems:
                     name = safe_unicode(item)
                     item = str(component.queryUtility(IURLNormalizer).normalize(name))
@@ -100,7 +107,7 @@ def render(self):
                             value, value)
                 html+='</table>'
         availableSubFolders = getattr(calendar, 'availableSubFolders', [])
-        if IATFolder.providedBy(self.context) and availableSubFolders:
+        if (IATFolder.providedBy(self.context) or IDexterityContainer.providedBy(self.context)) and availableSubFolders:
             html += '<br/><b>%s</b><br/><table>' % (_('Sub-Folders'))
             fieldid = 'subFolders'
             for folderId in availableSubFolders: