Changeset 2441 in products

Timestamp:

Jun 1, 2010 7:13:26 PM (14 years ago)

Author:

mylan

Message:

#144: Merged [3479] bugfix commit from /trunk

Location:

quintagroup.seoptimizer/branches/plone4

Files:

• . (modified) (1 prop)
• quintagroup/seoptimizer/browser/views.py (modified) (1 diff)
• quintagroup/seoptimizer/tests/testBugs.py (modified) (3 diffs)

quintagroup.seoptimizer/branches/plone4

@@ -1 +1 @@
 /quintagroup.seoptimizer/branches/refactoring2.3.0:1776-2133
+/quintagroup.seoptimizer/trunk:2435-2440

@@ -1 +1 @@
 /quintagroup.seoptimizer/branches/refactoring2.3.0:1776-2133
+/quintagroup.seoptimizer/trunk:2435-2440

quintagroup.seoptimizer/branches/plone4/quintagroup/seoptimizer/browser/views.py

@@ -244 +244 @@
                     globalCustomMetaTags.append(
                         {'meta_name' : name_value[0],
-                         'meta_content' : len(name_value) == 1 and '' or name_value[1]})
+                         'meta_content' : len(name_value) > 1 and name_value[1] or ''})
         for tag in custommetatags:
             meta_name, meta_content = tag['meta_name'], tag['meta_content']

quintagroup.seoptimizer/branches/plone4/quintagroup/seoptimizer/tests/testBugs.py

@@ -12 +12 @@
 
 from quintagroup.seoptimizer.browser.interfaces import IPloneSEOLayer
+from quintagroup.seoptimizer.browser.views import PROP_CUSTOM_PREFIX
+from quintagroup.seoptimizer.browser.seo_configlet import ISEOConfigletSchema
 from quintagroup.canonicalpath.interfaces import ICanonicalLink
 from quintagroup.canonicalpath.adapters import DefaultCanonicalLinkAdapter
@@ -92 +94 @@
                             ICanonicalLink)
 
-
     def test_bug_19_23_at_plone_org(self):
         """overrides.zcml should present in the root of the package"""
@@ -100 +101 @@
         except IOError:
             self.fail("overrides.zcml removed from the package root")
+
+    def test_bug_custom_metatags_update(self):
+        # Prepare a page for the test
+        page = self.portal["front-page"]
+        request = self.portal.REQUEST
+        directlyProvides(request, IPloneSEOLayer)
+        seo_context_props = getMultiAdapter((page, request), name="seo-context-properties")
+        # Set default custom meta tag without default value (tag name only)
+        self.gseo = queryAdapter(self.portal, ISEOConfigletSchema)
+        self.gseo.default_custom_metatags = ["test_tag",]
+        try:
+            # Breakage on updating custom metatag with seo-context-properties view
+            seo_context_props.updateSEOCustomMetaTagsProperties([])
+        except IndexError:
+            self.fail("Error in calculating of default tag value, when only tag name set "\
+                      "in default_custom_metatags property of the configlet.")
 
 

@@ -1 +1 @@
 /quintagroup.seoptimizer/branches/refactoring2.3.0:1776-2133
+/quintagroup.seoptimizer/trunk:2435-2440