Changeset 1831 in products

Timestamp:

Feb 25, 2010 3:17:37 PM (14 years ago)

Author:

mylan

Message:

#142: Minimize calculations for seo_context view: Remove 'seo_globalWithoutLocalCustomMetaTags' from the _seotags dictionary - need only for SEO tags edit form; use memoized plone_context_state.object_title values as default Title for the object

File:

• quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/browser/views.py (modified) (3 diffs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/browser/views.py

@@ -28 +28 @@
     def __init__(self, *args, **kwargs):
         super(SEOContext, self).__init__(*args, **kwargs)
-        self.pcs = queryMultiAdapter((self.context, self.request), name="plone_portal_state")
-        self.gseo = queryAdapter(self.pcs.portal(), ISEOConfigletSchema)
+        self.pps = queryMultiAdapter((self.context, self.request), name="plone_portal_state")
+        self.pcs = queryMultiAdapter((self.context, self.request), name="plone_context_state")
+        self.gseo = queryAdapter(self.pps.portal(), ISEOConfigletSchema)
         self._seotags = self._getSEOTags()
 
@@ -38 +39 @@
     def _getSEOTags(self):
         seotags = {
-            "seo_title": self.getSEOProperty( 'qSEO_title', accessor='Title' ),
+            "seo_title": self.getSEOProperty( 'qSEO_title', default=self.pcs.object_title() ),
             "seo_robots": self.getSEOProperty( 'qSEO_robots', default='ALL'),
             "seo_description": self.getSEOProperty( 'qSEO_description', accessor='Description' ),
             "seo_distribution": self.getSEOProperty( 'qSEO_distribution', default="Global"),
             "seo_customMetaTags": self.seo_customMetaTags(),
-            "seo_globalWithoutLocalCustomMetaTags": self.seo_globalWithoutLocalCustomMetaTags(),
             "seo_localCustomMetaTags": self.seo_localCustomMetaTags(),
             "seo_globalCustomMetaTags": self.seo_globalCustomMetaTags(),
@@ -134 +134 @@
         """
         canpath = queryAdapter(self.context, interfaces.ISEOCanonicalPath)
-        return self.pcs.portal_url() + canpath.canonical_path()
+        return self.pps.portal_url() + canpath.canonical_path()