Changeset 1672 in products

Timestamp:

Feb 9, 2010 1:30:50 PM (14 years ago)

Author:

mylan

Message:

Reregister ICanonicalPath adapter to IATContentType interface, which is more specific then IBaseContent (which registered by quintagroup.canonical pack)

Location:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer

Files:

• adapters.py (modified) (2 diffs)
• browser/views.py (modified) (1 diff)
• configure.zcml (modified) (1 diff)
• tests/testCanonicalURL.py (modified) (2 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/adapters.py

@@ -8 +8 @@
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import getToolByName
-from Products.Archetypes.interfaces import IBaseContent
-
+from Products.ATContentTypes.interface import IATContentType
 
 from quintagroup.seoptimizer.util import SortedDict
@@ -77 +76 @@
        SEO canonical path value.
     """
-    adapts(IBaseContent)
+    adapts(IATContentType)
     implements(ICanonicalPath)
 

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py

@@ -209 +209 @@
         """
         purl = getToolByName(self.context, 'portal_url')()
-        canpath = queryAdapter(self.context, interfaces.ICanonicalPath,
-            name='qseo_canonical')
+        canpath = queryAdapter(self.context, interfaces.ICanonicalPath)
         return purl + canpath.canonical_path()
 

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/configure.zcml

@@ -57 +57 @@
 
   <adapter
-      name="qseo_canonical"
       factory=".adapters.canonicalPathAdapter"
       />

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testCanonicalURL.py

@@ -56 +56 @@
 
     def test_canonicalAdapterRegistration(self):
-        canonical = queryAdapter(self.mydoc, interface=ICanonicalPath,
-            name='qseo_canonical')
+        canonical = queryAdapter(self.mydoc, interface=ICanonicalPath)
         self.assertTrue(canonical is not None,
             "Not registered 'qseo_canonical' adapter")
@@ -65 +64 @@
         mydoc_path_rel = '/'+'/'.join(purl.getRelativeContentPath(self.mydoc))
 
-        canonical = queryAdapter(self.mydoc, ICanonicalPath, name='qseo_canonical')
+        canonical = queryAdapter(self.mydoc, ICanonicalPath)
         cpath = canonical.canonical_path()
         self.assertTrue(cpath == mydoc_path_rel,
             "By canonical path adapter got: '%s', must be: '%s'" % (
              cpath, mydoc_path_rel))
-        
+
         # Update canonical url property
         mydoc_url_new = self.mydoc.absolute_url() + '.new'