Merge pull request #92 from seantis/issue_91

Issue 91
seantis · Oct 22, 2015 · 35e6818 · 35e6818
2 parents 638bb6d + 7033128
commit 35e6818
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/docs/HISTORY.rst b/docs/HISTORY.rst
@@ -5,6 +5,9 @@ Changelog
 1.6 (unreleased)
 ~~~~~~~~~~~~~~~~
 
+- Limit the range of different guidle categories. Implements #91.
+  [msom]
+
 - Change layout of event list and detail for visual redesign.
   [msom]
 

diff --git a/seantis/dir/events/configure.zcml b/seantis/dir/events/configure.zcml
@@ -304,6 +304,15 @@
        handler=".upgrades.upgrade_1017_to_1018">
     </genericsetup:upgradeStep>
 
+    <genericsetup:upgradeStep
+       title="Change guidle classifier"
+       description=""
+       source="1018"
+       destination="1019"
+       profile="seantis.dir.events:default"
+       handler=".upgrades.upgrade_1018_to_1019">
+    </genericsetup:upgradeStep>
+
     <!-- Advanced Theme Adjustments through Diazo -->
     <plone:static name="seantis.dir.events.izug-theme"
       directory="themes/izug-theme" type="theme"

diff --git a/seantis/dir/events/profiles/default/metadata.xml b/seantis/dir/events/profiles/default/metadata.xml
@@ -1,5 +1,5 @@
 <metadata>
-    <version>1018</version>
+    <version>1019</version>
     <dependencies>
         <dependency>profile-plone.app.dexterity:default</dependency>
         <dependency>profile-plone.app.event:default</dependency>

diff --git a/seantis/dir/events/sources/guidle.py b/seantis/dir/events/sources/guidle.py
@@ -29,7 +29,8 @@ def classify(self, classifications):
                 continue
 
             categories = set([
-                tag.attrib.get('name') for tag in classification.iterchildren()
+                tag.attrib.get('subcategoryName')
+                for tag in classification.iterchildren()
             ])
 
         return categories

diff --git a/seantis/dir/events/upgrades.py b/seantis/dir/events/upgrades.py
@@ -345,3 +345,8 @@ def upgrade_1016_to_1017(context):
 def upgrade_1017_to_1018(context):
     # Enable jquerytools.dateinput.js
     enable_jquerytools_dateinput_js(context)
+
+
+def upgrade_1018_to_1019(context):
+    # Delete imported guidle events if the default classifier is used
+    upgrade_1016_to_1017(context)