Don't let the lineage.childsites vocabulary fail, if there are multip…

…le childsites with the same id.
collective · Aug 28, 2014 · c091f96 · c091f96 · frisi · Nov 20, 2014
1 parent 4e4cec4
commit c091f96
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/docs/HISTORY.rst b/docs/HISTORY.rst
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.5 (unreleased)
+----------------
+
+- Don't let the ``lineage.childsites`` vocabulary fail, if there are multiple
+  childsites with the same id.
+  [thet]
+
+
 0.4 (2012-01-10)
 ----------------
 

diff --git a/lineage/index/vocabulary.py b/lineage/index/vocabulary.py
@@ -15,10 +15,19 @@ def childSiteVocabulary(context):
     """
     cat = getToolByName(context, 'portal_catalog')
 
-    brains = cat(object_provides=IChildSite.__identifier__,
-                 sort_on='sortable_title')
-    terms = [SimpleTerm(value=brain.id, token=brain.id, title=brain.Title)
-             for brain in brains]
+    brains = cat(
+        object_provides=IChildSite.__identifier__,
+        sort_on='sortable_title'
+    )
+
+    set_brains = []
+    terms = []
+    for brain in brains:
+        val = brain.id
+        if val not in set_brains:
+            # vocabulary values and tokens must be unique
+            set_brains.append(val)
+            terms.append(SimpleTerm(value=val, token=val, title=brain.Title))
     return SimpleVocabulary(terms)
 
 

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '0.4'
+version = '0.5.dev0'
 
 setup(name='lineage.index',
       version=version,