[commits] r104 - in selinux-site/trunk/selinux.theme/selinux/theme: . profiles/default

[tim at mail.se.linux.org]

Author: tim
Date: 2007-08-23 00:34:26 +0200 (Thu, 23 Aug 2007)
New Revision: 104

Modified:
   selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/import_steps.xml
   selinux-site/trunk/selinux.theme/selinux/theme/setuphandlers.py
Log:
Initial content (folders for news, events etc) is now created the right way. buildout works again.


Modified: selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/import_steps.xml
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/import_steps.xml	2007-08-22 22:30:52 UTC (rev 103)
+++ selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/import_steps.xml	2007-08-22 22:34:26 UTC (rev 104)
@@ -3,6 +3,7 @@
   <import-step id="selinuxtheme-various" version="20070531"
                handler="selinux.theme.setuphandlers.setupVarious"
                title="Setup SeLinux theme">
-    Add logo, styles and templates that defines the SeLinux site design.
+    <dependency step="content" />
+      Add logo, styles and templates that defines the SeLinux site design.
   </import-step>
 </import-steps>

Modified: selinux-site/trunk/selinux.theme/selinux/theme/setuphandlers.py
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/setuphandlers.py	2007-08-22 22:30:52 UTC (rev 103)
+++ selinux-site/trunk/selinux.theme/selinux/theme/setuphandlers.py	2007-08-22 22:34:26 UTC (rev 104)
@@ -16,14 +16,7 @@
     existing = site.objectIds()
 
     # Events topic
-    if 'handelser' not in existing:
-        events_title = 'Händelser'
-        events_desc = 'Händelser'
-
-        _createObjectByType('Large Plone Folder', site, id='handelser',
-                            title=events_title, description=events_desc)
-        _createObjectByType('Topic', site.events, id='aggregator',
-                            title=events_title, description=events_desc)
+    if 'handelser' in existing:
         folder = site.handelser
         folder.setConstrainTypesMode(constraintypes.ENABLED)
         folder.setLocallyAllowedTypes(['Event'])
@@ -48,11 +41,9 @@
         # Only take events in the future
         date_crit.setDateRange('+') # This is irrelevant when the date is now
         date_crit.setOperation('more')
-    else:
-        topic = site.handelser
 
-    if wftool.getInfoFor(topic, 'review_state') != 'published':
-        wftool.doActionFor(topic, 'publish')
+        if wftool.getInfoFor(topic, 'review_state') != 'published':
+            wftool.doActionFor(topic, 'publish')
 
 
 def createNewsFolder(site):
@@ -60,15 +51,7 @@
     existing = site.objectIds()
 
     # News topic
-    if 'nyheter' not in existing:
-        news_title = 'Nyheter'
-        news_desc = 'Nyheter'
-
-        _createObjectByType('Large Plone Folder', site, id='nyheter',
-                            title=news_title, description=news_desc)
-        _createObjectByType('Topic', site.nyheter, id='aggregator',
-                            title=news_title, description=news_desc)
-
+    if 'nyheter' in existing:
         folder = site.nyheter
         folder.setConstrainTypesMode(constraintypes.ENABLED)
         folder.setLocallyAllowedTypes(['News Item'])
@@ -86,7 +69,7 @@
         state_crit = topic.addCriterion('review_state', 'ATSimpleStringCriterion')
         state_crit.setValue('published')
         topic.setSortCriterion('effective', True)
-        topic.setLayout('folder_summary_view')
+        topic.manage_addProperty('layout', 'folder_summary_view', 'string')
         topic.unmarkCreationFlag()
 
         if wftool.getInfoFor(topic, 'review_state') != 'published':
@@ -128,5 +111,5 @@
     # publish member folder
     members = getattr(site, 'medlemmar', None)
     if members is not None:
-        if workflow.getInfoFor(obj, 'review_state') != 'published':
-            workflow.doActionFor(obj, 'publish')
+        if workflow.getInfoFor(members, 'review_state') != 'published':
+            workflow.doActionFor(members, 'publish')