Changeset 3224 in products for quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py

Timestamp:

Jun 1, 2011 3:38:29 PM (13 years ago)

Author:

vmaksymiv

Message:

fixed getting canonical url property

File:

• quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py (modified) (2 diffs)

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

@@ -65 +65 @@
                                                  'Subject', ()),
             "seo_keywords": self.getSEOProperty('qSEO_keywords', default=()),
-            "seo_canonical": self.getCanonical(),
+            "seo_canonical": self.getSEOProperty(CANONICAL_PROPERTY),
             # Add test properties
             "has_seo_title": self.context.hasProperty('qSEO_title'),
@@ -158 +158 @@
         return result
 
+    # Not used
     def getCanonical(self):
-        canonical = queryAdapter(self.context, ICanonicalLink)
-        return canonical and canonical.canonical_link or ""
+        # TODO: rewrite function structure
+        if self.context.hasProperty(CANONICAL_PROPERTY):
+            canonical = queryAdapter(self.context, ICanonicalLink)
+            return canonical and canonical.canonical_link or ""
+        return ""