From d12465bde0038783ef1c1f0b8c11ab655cc17f60 Mon Sep 17 00:00:00 2001
From: Gil Forcada Codinachs <gil.gnome@gmail.com>
Date: Sun, 13 Nov 2016 10:01:35 +0100
Subject: [PATCH 1/2] showEditableBorder was renamed to showToolbar

---
 CHANGES.rst                                       | 4 ++++
 plone/app/layout/viewlets/contentactions_blank.pt | 4 ++--
 plone/app/layout/viewlets/contentviews.pt         | 2 +-
 plone/app/layout/viewlets/menu.pt                 | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cb721e44..4dcc9895 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -23,6 +23,10 @@ Bug fixes:
 - Remove commented out viewlet (meant for Plone 3) and its related template.
   [gforcada]
 
+- Adapt code to some deprecated methods getting finally removed.
+  [gforcada]
+
+
 2.6.1 (2016-06-07)
 ------------------
 
diff --git a/plone/app/layout/viewlets/contentactions_blank.pt b/plone/app/layout/viewlets/contentactions_blank.pt
index 4af1fa2c..41b946df 100644
--- a/plone/app/layout/viewlets/contentactions_blank.pt
+++ b/plone/app/layout/viewlets/contentactions_blank.pt
@@ -1,5 +1,5 @@
 <div class="contentActions"
      tal:define="ploneview context/@@plone"
-     tal:condition="ploneview/showEditableBorder">
+     tal:condition="ploneview/showToolbar">
 
-</div>
\ No newline at end of file
+</div>
diff --git a/plone/app/layout/viewlets/contentviews.pt b/plone/app/layout/viewlets/contentviews.pt
index 5abe09b3..c0d759d6 100644
--- a/plone/app/layout/viewlets/contentviews.pt
+++ b/plone/app/layout/viewlets/contentviews.pt
@@ -1,5 +1,5 @@
 <tal:contentviews tal:define="ploneview context/@@plone;"
-                  tal:condition="ploneview/showEditableBorder"
+                  tal:condition="ploneview/showToolbar"
                   i18n:domain="plone">
 
   <tal:block define="actions view/tabSet1;">
diff --git a/plone/app/layout/viewlets/menu.pt b/plone/app/layout/viewlets/menu.pt
index 61f9c8a0..ea6a0d3b 100644
--- a/plone/app/layout/viewlets/menu.pt
+++ b/plone/app/layout/viewlets/menu.pt
@@ -1,5 +1,5 @@
 <tal:contentviews tal:define="ploneview context/@@plone;"
-                  tal:condition="ploneview/showEditableBorder"
+                  tal:condition="ploneview/showToolbar"
                   i18n:domain="plone">
   <tal:actions tal:repeat="action options/actions">
     <li tal:attributes="id string:contentview-${action/id};
@@ -37,4 +37,4 @@
       </tal:var>
     </li>
   </tal:actions>
-</tal:contentviews>
\ No newline at end of file
+</tal:contentviews>

From 8da53a12c81930c8acc13b0f0f2fb6d7252dccb2 Mon Sep 17 00:00:00 2001
From: Gil Forcada <gil.gnome@gmail.com>
Date: Sun, 13 Nov 2016 21:29:15 +0100
Subject: [PATCH 2/2] have_portets is on plone_layout

It was on @@plone view but it was already deprecated and
finally it has been removed.
---
 plone/app/layout/viewlets/common.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plone/app/layout/viewlets/common.py b/plone/app/layout/viewlets/common.py
index 423e6c65..dc8c1def 100644
--- a/plone/app/layout/viewlets/common.py
+++ b/plone/app/layout/viewlets/common.py
@@ -420,12 +420,14 @@ class ManagePortletsFallbackViewlet(ViewletBase):
     def update(self):
         ploneview = getMultiAdapter((
             self.context, self.request), name=u'plone')
+        plonelayout = getMultiAdapter((
+            self.context, self.request), name=u'plone_layout')
         context_state = getMultiAdapter((self.context, self.request),
                                         name=u'plone_context_state')
 
         self.portlet_assignable = context_state.portlet_assignable()
-        self.sl = ploneview.have_portlets('plone.leftcolumn', self.context)
-        self.sr = ploneview.have_portlets('plone.rightcolumn', self.context)
+        self.sl = plonelayout.have_portlets('plone.leftcolumn', self.context)
+        self.sr = plonelayout.have_portlets('plone.rightcolumn', self.context)
         self.object_url = context_state.object_url()
 
     def available(self):