Merge pull request #237 from collective/fix-mapfilter-contentselector

Fix getting Collectionish context in geojson call

Author: petschki

news/+mapfilter_contentselector.bugfix

@@ -0,0 +1 @@
+Fix selecting Collectionish item in MapsTile/Portlet geojson view. @petschki

src/collective/collectionfilter/baseviews.py

@@ -106,16 +106,17 @@ def content_selector(self):
             return self.settings.content_selector
 
         collectionish = (
-            ICollectionish(self.collection.getObject()) if self.collection else None
+            ICollectionish(self.collection.getObject(), None) if self.collection else None
         )
+
         if collectionish is not None:
             # select default content
             collectionish.selectContent()
-        selector = collectionish.content_selector
-        if collectionish is None or not selector:
-            return "#content-core"
-        else:
-            return selector
+            selector = collectionish.content_selector
+            if selector:
+                return selector
+
+        return "#content-core"
 
     @property
     def ajax_load(self):
@@ -413,9 +414,9 @@ def __call__(self):
         def locations(self):
             custom_query = {}  # Additional query to filter the collection
 
-            collection = self.context
+            collection = ICollectionish(self.context, None)
             if not collection:
-                return None
+                return []
 
             # Recursively transform all to unicode
             request_params = safe_decode(get_top_request(self.request).form or {})
@@ -425,7 +426,7 @@ def locations(self):
             custom_query = base_query(request_params)
             custom_query = make_query(custom_query)
 
-            return ICollectionish(collection).results(custom_query, request_params)
+            return collection.results(custom_query, request_params)
 
 
 class BaseResetFilterView(BaseFilterView):

src/collective/collectionfilter/tiles/__init__.py

@@ -95,14 +95,11 @@ class CollectionishLayout(CollectionishCollection):
     def __init__(self, context):
         """Adapt either collections or contentlisting tile. The name is sorted content selector"""
         self.context = context
+        self.collection = ICollection(self.context, None)
 
-        # self.context might not be adaptable
-        # make sure you select the right content with
-        # selectContent(selector) after initialization
-        try:
-            self.collection = ICollection(self.context)
-        except TypeError:
-            self.collection = None
+        if self.collection is None:
+            # context might not be adaptable -> try to find a collectionish tile
+            self.selectContent()
 
     def selectContent(self, selector=None):
         """Pick tile that selector will match, otherwise pick first one.