Merge pull request #34 from plone/plip-13770-portal-tools-removal

PLIP 13770 Use plone_interface_info instead of portal_interface
plone · Nov 12, 2013 · 4c24564 · 4c24564 · mister-roboto · Nov 12, 2013
2 parents 2be94b2 + d255302
commit 4c24564
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 1.10.0 (unreleased)
 -------------------
 
+- Do not use portal_interface tool but @@plone_interface_info (PLIP #13770).
+  [ale-rt]
+
 - Internationalized file size and content type on file widget.
   [thomasdesvenain]
 

diff --git a/Products/Archetypes/skins/archetypes/widgets/reference.pt b/Products/Archetypes/skins/archetypes/widgets/reference.pt
@@ -15,7 +15,8 @@
 
         <tal:block tal:condition="not:field/multiValued"
                tal:define="ref python:refs[0];
-                           obj ref/getTargetObject">
+                           obj ref/getTargetObject;
+                           ref_interface_info nocall:ref/@@plone_interface_info">
 
             <a href="#"
                tal:attributes="href obj/absolute_url;
@@ -25,7 +26,7 @@
             </a>
 
             <a href="#"
-               tal:condition="python:portal.portal_interface.objectImplements(ref,'Products.Archetypes.interfaces.referenceengine.IContentReference')"
+               tal:condition="python:ref_interface_info.provides('Products.Archetypes.interfaces.referenceengine.IContentReference')"
                tal:attributes="href python:ref.getContentObject().absolute_url()"
                tal:content="field/relationship">
               reference object link
@@ -35,7 +36,8 @@
 
         <ul tal:condition="field/multiValued">
           <li tal:repeat="ref refs">
-             <tal:block tal:define="obj ref/getTargetObject">
+             <tal:block tal:define="obj ref/getTargetObject;
+                                    ref_interface_info nocall:ref/@@plone_interface_info">
                 <a href="#"
                    tal:attributes="href obj/absolute_url;
                                    class python:obj.portal_type.replace(' ', '_')"
@@ -44,7 +46,7 @@
                 </a>
 
                 <a href="#"
-                   tal:condition="python:portal.portal_interface.objectImplements(ref,'Products.Archetypes.interfaces.referenceengine.IContentReference')"
+                   tal:condition="python:ref_interface_info.provides('Products.Archetypes.interfaces.referenceengine.IContentReference')"
                    tal:attributes="href python:ref.getContentObject().absolute_url()"
                    tal:content="field/relationship">
                   reference object link