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

[tim at mail.se.linux.org]

Author: tim
Date: 2007-11-06 17:14:02 +0100 (Tue, 06 Nov 2007)
New Revision: 124

Removed:
   selinux-site/trunk/selinux.theme/selinux/theme/profiles/default/structure/
Modified:
   selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/import_steps.xml
   selinux-site/trunk/selinux.policy/selinux/policy/setuphandlers.py
Log:
Folders are now created according to a web structure proposal.


Modified: selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/import_steps.xml
===================================================================
--- selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/import_steps.xml	2007-10-30 21:46:45 UTC (rev 123)
+++ selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/import_steps.xml	2007-11-06 16:14:02 UTC (rev 124)
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <import-steps>
-  <import-step id="selinuxtheme-various" version="20070531"
-               handler="selinux.theme.setuphandlers.setupVarious"
-               title="Setup SeLinux policy">
+  <import-step id="selinuxpolicy-various" version="20070531"
+               handler="selinux.policy.setuphandlers.setupVarious"
+               title="SeLinux Policy">
     Set site title, roles, permissions, theme etc.
+    <dependency step="types" />
   </import-step>
 </import-steps>

Modified: selinux-site/trunk/selinux.policy/selinux/policy/setuphandlers.py
===================================================================
--- selinux-site/trunk/selinux.policy/selinux/policy/setuphandlers.py	2007-10-30 21:46:45 UTC (rev 123)
+++ selinux-site/trunk/selinux.policy/selinux/policy/setuphandlers.py	2007-11-06 16:14:02 UTC (rev 124)
@@ -1,99 +1,16 @@
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.utils import _createObjectByType
 from Products.ATContentTypes.lib import constraintypes
+from selinux.policy.content import createContent
 
 def setupVarious(context):
     site = context.getSite()
     setupFrontpage(site)
     removePloneContent(site)
     setupMemberFolder(site)
-    createNewsFolder(site)
-    createEventsFolder(site)
-    publishInitialFolders(site)
-    createLatestFeed(site)
+    createContent(site)
 
-def createEventsFolder(site):
-    wftool = getToolByName(site, 'portal_workflow')
-    existing = site.objectIds()
 
-    # Events topic
-    if 'handelser' in existing:
-        folder = site.handelser
-        folder.setConstrainTypesMode(constraintypes.ENABLED)
-        folder.setLocallyAllowedTypes(['Event'])
-        folder.setImmediatelyAddableTypes(['Event'])
-        folder.setDefaultPage('aggregator')
-        folder.unmarkCreationFlag()
-
-        if wftool.getInfoFor(folder, 'review_state') != 'published':
-            wftool.doActionFor(folder, 'publish')
-
-        topic = folder.aggregator
-        topic.unmarkCreationFlag()
-
-        type_crit = topic.addCriterion('Type','ATPortalTypeCriterion')
-        type_crit.setValue('Event')
-        sort_crit = topic.addCriterion('start','ATSortCriterion')
-        state_crit = topic.addCriterion('review_state', 'ATSimpleStringCriterion')
-        state_crit.setValue('published')
-        date_crit = topic.addCriterion('start', 'ATFriendlyDateCriteria')
-        # Set date reference to now
-        date_crit.setValue(0)
-        # Only take events in the future
-        date_crit.setDateRange('+') # This is irrelevant when the date is now
-        date_crit.setOperation('more')
-
-        if wftool.getInfoFor(topic, 'review_state') != 'published':
-            wftool.doActionFor(topic, 'publish')
-
-
-def createLatestFeed(site):
-    existing = site.objectIds()
-
-    # Collection for making a feed
-    if 'nytt' not in existing:
-        site.invokeFactory('Topic', id='nytt', title='Senaste')
-        topic = site.nytt
-
-        topic.setLimitNumber(True)
-        topic.setItemCount(30)
-        state_crit = topic.addCriterion('review_state',
-                                        'ATSimpleStringCriterion')
-        state_crit.setValue('published')
-        topic.setSortCriterion('effective', True)
-        topic.manage_addProperty('layout', 'folder_summary_view', 'string')
-        topic.unmarkCreationFlag()
-
-    
-def createNewsFolder(site):
-    wftool = getToolByName(site, 'portal_workflow')
-    existing = site.objectIds()
-
-    # News topic
-    if 'nyheter' in existing:
-        folder = site.nyheter
-        folder.setConstrainTypesMode(constraintypes.ENABLED)
-        folder.setLocallyAllowedTypes(['News Item'])
-        folder.setImmediatelyAddableTypes(['News Item'])
-        folder.setDefaultPage('aggregator')
-        folder.unmarkCreationFlag()
-
-        if wftool.getInfoFor(folder, 'review_state') != 'published':
-            wftool.doActionFor(folder, 'publish')
-
-        topic = site.nyheter.aggregator
-        type_crit = topic.addCriterion('Type','ATPortalTypeCriterion')
-        type_crit.setValue('News Item')
-        sort_crit = topic.addCriterion('created','ATSortCriterion')
-        state_crit = topic.addCriterion('review_state', 'ATSimpleStringCriterion')
-        state_crit.setValue('published')
-        topic.setSortCriterion('effective', True)
-        topic.manage_addProperty('layout', 'folder_summary_view', 'string')
-        topic.unmarkCreationFlag()
-
-        if wftool.getInfoFor(topic, 'review_state') != 'published':
-            wftool.doActionFor(topic, 'publish')
-
 def setupFrontpage(site):
     if site.hasProperty('default_page'):
         site.manage_delProperties(ids=['default_page'])
@@ -132,13 +49,3 @@
     if members is not None:
         if workflow.getInfoFor(members, 'review_state') != 'published':
             workflow.doActionFor(members, 'publish')
-
-def publishInitialFolders(site):
-    workflow = getToolByName(site, 'portal_workflow')
-
-    folders = ('arbetsgrupper', 'dokumentation', 'support', 'foreningen')
-    for folder_id in folders:
-        folder = getattr(site, folder_id, None)
-        if folder is not None:
-            if workflow.getInfoFor(folder, 'review_state') != 'published':
-                workflow.doActionFor(folder, 'publish')