Changeset 1900 in products

Timestamp:

Mar 12, 2010 2:08:40 PM (14 years ago)

Author:

mylan

Message:

#166: Force usage ISEOConfigletSchema adapter for getting seo properties

Location:

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer

Files:

• adapters.py (modified) (5 diffs)
• browser/views.py (modified) (3 diffs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/adapters.py

@@ -3 +3 @@
 from zope.component import adapts
 from zope.interface import implements
+from zope.component import queryAdapter
 from zope.component import queryMultiAdapter
 
@@ -11 +12 @@
 from quintagroup.seoptimizer.util import SortedDict
 from quintagroup.seoptimizer.interfaces import IMetaKeywords, IMappingMetaTags
+from quintagroup.seoptimizer.browser.seo_configlet import ISEOConfigletSchema
 
 METADATA_MAPS = dict([
@@ -42 +44 @@
         meta_keywords = []
         filtered_keywords = []
-        portal_props = getToolByName(self.context, 'portal_properties')
-        seo_props = getToolByName(portal_props, 'seo_properties', None)
         seo_context = queryMultiAdapter((self.context, request), name='seo_context')
         if seo_context:
@@ -55 +55 @@
     def __init__(self, context):
         self.context = context
-        self.portal_props = getToolByName(self.context, 'portal_properties')
-        self.seo_props = getToolByName(self.portal_props, 'seo_properties', None)
+        pps = queryMultiAdapter((self.context, self.context.REQUEST),
+                                name="plone_portal_state")
+        self.gseo = queryAdapter(pps.portal(), ISEOConfigletSchema)
 
     def getMappingMetaTags(self):
@@ -62 +63 @@
         """
         metadata_name = SortedDict()
-        if self.seo_props:
-            pmn = self.seo_props.getProperty('metatags_order', ())
-            for mt in pmn:
+        if self.gseo:
+            for mt in self.gseo.metatags_order:
                 if METADATA_MAPS.has_key(mt):
                     metadata_name[mt] = METADATA_MAPS[mt]

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

@@ -120 +120 @@
         """
         result = []
-        context = aq_inner(self.context)
         if self.gseo:
-            custom_meta_tags = self.gseo.default_custom_metatags
-            for tag in custom_meta_tags:
+            for tag in self.gseo.default_custom_metatags:
                 name_value = tag.split(SEPERATOR)
                 if name_value[0]:
@@ -141 +139 @@
     """
     template = ViewPageTemplateFile('templates/seo_context_properties.pt')
+
+    def __init__(self, *args, **kwargs):
+        super(SEOContextPropertiesView, self).__init__(*args, **kwargs)
+        self.pps = queryMultiAdapter((self.context, self.request),
+                                     name="plone_portal_state")
+        self.gseo = queryAdapter(self.pps.portal(), ISEOConfigletSchema)
+
 
     def test( self, condition, first, second ):
@@ -231 +236 @@
         """ Update seo custom metatags properties.
         """
-        context = aq_inner(self.context)
-        site_properties = getToolByName(context, 'portal_properties')
         globalCustomMetaTags = []
-        if hasattr(site_properties, 'seo_properties'):
-            custom_meta_tags = getattr(site_properties.seo_properties, 'default_custom_metatags', [])
+        if self.gseo:
+            custom_meta_tags = self.gseo.default_custom_metatags
             for tag in custom_meta_tags:
                 name_value = tag.split(SEPERATOR)
                 if name_value[0]:
-                    globalCustomMetaTags.append({'meta_name'    : name_value[0],
-                                                 'meta_content' : len(name_value) == 1 and '' or name_value[1]})
+                    globalCustomMetaTags.append(
+                        {'meta_name' : name_value[0],
+                         'meta_content' : len(name_value) == 1 and '' or name_value[1]})
         for tag in custommetatags:
             meta_name, meta_content = tag['meta_name'], tag['meta_content']
             if meta_name:
-                if not [gmt for gmt in globalCustomMetaTags if (gmt['meta_name']==meta_name and gmt['meta_content']==meta_content)]:
+                if not [gmt for gmt in globalCustomMetaTags \
+                        if (gmt['meta_name']==meta_name and gmt['meta_content']==meta_content)]:
                     self.setProperty('%s%s' % (PROP_CUSTOM_PREFIX, meta_name), meta_content)