Merge pull request #67 from collective/djay/fix_geo_portlets

fix bug where portlets manager is missing and plone doesn't start up …

CHANGES.rst

@@ -8,7 +8,8 @@ Changelog
   [djay]
 - Fix 5.2 where operators should not be used on all index types
   [djay]
-
+- Fix bug where portlets didn't work without GeoLocation dependencies
+  [djay]
 
 3.1 (2019-06-06)
 ----------------

src/collective/collectionfilter/portlets/configure.zcml

@@ -6,7 +6,7 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="collective.collectionfilter">
 
-    <include package="plone.app.portlets" />
+  <include package="plone.app.portlets" />
 
   <plone:portlet
       name="collective.collectionfilter.portlets.CollectionFilter"
@@ -50,6 +50,15 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      zcml:condition="installed collective.geolocationbehavior"
+      name="portlets_with_maps"
+      title="collective.collectionfilter portlets"
+      directory="profiles/portlets_with_maps"
+      description='Extension profile for Plone.'
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:registerProfile
       name="uninstall"
       title="collective.collectionfilter portlets uninstall"

src/collective/collectionfilter/portlets/profiles/default/portlets.xml

@@ -10,9 +10,4 @@
       title="Collection Search"
       description="This portlet allows fulltext search in collection results."
       />
-  <portlet
-      addview="collective.collectionfilter.portlets.CollectionMaps"
-      title="Collection Maps"
-      description="This portlet allows map filtering in collection results."
-      />
 </portlets>

src/collective/collectionfilter/portlets/profiles/portlets_with_maps/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<metadata>
+  <version>2</version>
+  <dependencies>
+    <dependency>profile-collective.collectionfilter:default</dependency>
+  </dependencies>
+</metadata>

src/collective/collectionfilter/portlets/profiles/portlets_with_maps/portlets.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<portlets>
+  <portlet
+      addview="collective.collectionfilter.portlets.CollectionFilter"
+      title="Collection Filter"
+      description="Portlet that groups collections items by criteria."
+      />
+  <portlet
+      addview="collective.collectionfilter.portlets.CollectionSearch"
+      title="Collection Search"
+      description="This portlet allows fulltext search in collection results."
+      />
+  <portlet
+      addview="collective.collectionfilter.portlets.CollectionMaps"
+      title="Collection Maps"
+      description="This portlet allows map filtering in collection results."
+      />
+</portlets>

src/collective/collectionfilter/portlets/profiles/uninstall/portlets.xml

@@ -8,4 +8,9 @@
       remove="True"
       addview="collective.collectionfilter.portlets.CollectionSearch"
       />
+  <portlet
+      rempve="True"
+      addview="collective.collectionfilter.portlets.CollectionMaps"
+      />
+
 </portlets>