Changeset 1935 in products for quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer

Timestamp:

Mar 18, 2010 10:05:38 AM (14 years ago)

Author:

mylan

Message:

#180: Add delete canonical_link property, some optimization

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

@@ -5 +5 @@
 from zope.component import queryAdapter
 from zope.component import queryMultiAdapter
+from zope.schema.interfaces import InvalidValue
+
 from plone.memoize import view, ram
 from plone.app.controlpanel.form import ControlPanelView
@@ -166 +168 @@
         Sets a new property with the given id, value and type or changes it.
         """
-        context = aq_inner(self.context)
+        context = aq_inner(self.context) 
         state = self.validateSEOProperty(property, value)
         if not state:
@@ -190 +192 @@
             if seo_key == 'custommetatags':
                 self.manageSEOCustomMetaTagsProperties(**kw)
-            elif seo_key == 'canonical':
-                canonical = seo_items[seo_key]
-                try:
-                    ICanonicalLink(self.context).canonical_link = canonical
-                except InvalidValue, e:
-                    return str(e)
             else:
                 if seo_key in seo_overrides_keys and seo_items.get(seo_key+SUFFIX):
                     seo_value = seo_items[seo_key]
-                    t_value = 'string'
-                    if type(seo_value)==type([]) or type(seo_value)==type(()): t_value = 'lines'
-                    state = self.setProperty(PROP_PREFIX+seo_key, seo_value, type=t_value)
+                    if seo_key == 'canonical':
+                        try:
+                            ICanonicalLink(self.context).canonical_link = seo_value
+                        except InvalidValue, e:
+                            state = "'%s' - wrong canonical url" % str(e)
+                    else:
+                        t_value = 'string'
+                        if type(seo_value)==type([]) or type(seo_value)==type(()): t_value = 'lines'
+                        state = self.setProperty(PROP_PREFIX+seo_key, seo_value, type=t_value)
                     if state:
                         return state
+                elif seo_key == 'canonical':
+                    del ICanonicalLink(self.context).canonical_link
                 elif context.hasProperty(PROP_PREFIX+seo_key):
                     delete_list.append(PROP_PREFIX+seo_key)