Merge pull request #187 from plone/thet-unwrap-searchbase

unwrap search_base in portlets
plone · May 31, 2015 · 6411887 · 6411887
2 parents 43099c8 + 64aab32
commit 6411887
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,10 @@ Changelog
 2.0a12 (unreleased)
 -------------------
 
+- Unwrap search_base for portlets, as it might be wrapped by the portlet
+  renderer class. Fixes an error with getting the events to display.
+  [thet]
+
 - Import BBB superclasses from  plone.app.portlets.portlets.base so it works
   with plone.app.portlets 3.0 and up
   [frapell]

diff --git a/plone/app/event/portlets/portlet_calendar.py b/plone/app/event/portlets/portlet_calendar.py
@@ -105,7 +105,8 @@ class Renderer(base.Renderer):
     def search_base(self):
         if not self._search_base:
             self._search_base = uuidToObject(self.data.search_base_uid)
-        return self._search_base
+        # aq_inner, because somehow search_base gets wrapped by the renderer
+        return aq_inner(self._search_base)
 
     @property
     def search_base_path(self):

diff --git a/plone/app/event/portlets/portlet_events.py b/plone/app/event/portlets/portlet_events.py
@@ -111,7 +111,8 @@ class Renderer(base.Renderer):
     def search_base(self):
         if not self._search_base:
             self._search_base = uuidToObject(self.data.search_base_uid)
-        return self._search_base
+        # aq_inner, because somehow search_base gets wrapped by the renderer
+        return aq_inner(self._search_base)
 
     @property
     def search_base_path(self):