From 9309c5dd566c2c7005f2303da125e7b8ac13a486 Mon Sep 17 00:00:00 2001
From: Rodrigo Ferreira de Souza <rodfersou@gmail.com>
Date: Wed, 13 Apr 2016 14:47:35 -0300
Subject: [PATCH] Remove unnecessary adapter

---
 CHANGES.rst                         |  6 ++++++
 setup.py                            |  2 +-
 src/collective/cover/adapters.py    | 15 ---------------
 src/collective/cover/configure.zcml |  8 --------
 4 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 src/collective/cover/adapters.py

diff --git a/CHANGES.rst b/CHANGES.rst
index 8b84e3e64..a315c66ea 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,12 @@ There's a frood who really knows where his towel is.
 1.1b2 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
+- The new version of plone.app.layout fix the ``<base>`` TAG to use the request ACTUAL_URL
+  variable instead of the context ``absolute_url``.
+  This remove the need to adapt the ``renderBase`` method to use ``cover URL + '/'`` as
+  ``<base>`` URL.
+  [rodfersou]
+
 - Handle `AssertionError` on upgrade step to profile 13 to avoid failures when a cover object has duplicated tiles on it.
   Now, an error message will be logged and the object will be skipped;
   you must manually remove the duplicated tiles (closes #619).
diff --git a/setup.py b/setup.py
index f7fa9affe..54b3bf364 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@
           'plone.app.iterate',
           'plone.app.jquery >=1.7.2',
           'plone.app.jquerytools >=1.5.1',
-          'plone.app.layout',
+          'plone.app.layout >=2.3.14',
           'plone.app.linkintegrity',
           'plone.app.lockingbehavior',
           'plone.app.registry',
diff --git a/src/collective/cover/adapters.py b/src/collective/cover/adapters.py
deleted file mode 100644
index 0addd079c..000000000
--- a/src/collective/cover/adapters.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from Acquisition import aq_inner
-from Products.CMFPlone.browser.ploneview import Plone
-
-
-class PloneView(Plone):
-
-    def renderBase(self):
-        """We need to return the cover url with a slash at the end
-        so relative calls to javascript are called for the cover object
-        and not its parent
-        """
-        context = aq_inner(self.context)
-        return context.absolute_url() + '/'
diff --git a/src/collective/cover/configure.zcml b/src/collective/cover/configure.zcml
index d5b22c6e6..280ea856c 100644
--- a/src/collective/cover/configure.zcml
+++ b/src/collective/cover/configure.zcml
@@ -57,14 +57,6 @@
     <browser:page attribute="jsonByType" name="jsonbytype" />
   </browser:pages>
 
-  <browser:page
-      for="collective.cover.content.ICover"
-      name="plone"
-      class=".adapters.PloneView"
-      permission="zope.Public"
-      allowed_interface="Products.CMFPlone.browser.interfaces.IPlone"
-      />
-
   <class class=".widgets.selectpreview.SelectPreviewWidget">
     <require
         permission="zope.Public"