Fix extension installation ordering (fixes layer order)

[zope-bootstrap.git] / src / koehsel.policy / koehsel / policy / setuphandlers.py

diff --git a/src/koehsel.policy/koehsel/policy/setuphandlers.py b/src/koehsel.policy/koehsel/policy/setuphandlers.py
index 22b3a87..dc45961 100644 (file)
--- a/src/koehsel.policy/koehsel/policy/setuphandlers.py
+++ b/src/koehsel.policy/koehsel/policy/setuphandlers.py
@@ -1,6 +1,11 @@
 from Products.CMFCore.utils import getToolByName
 
-INSTALL_PRODUCTS = ['easyshop.core']
+INSTALL_PRODUCTS = [
+    'easyshop.core', 
+    'koehsel.theme',
+]
+
+SITE_OWNER = 'admin'
 
 def siteSetup(context):
 
@@ -8,10 +13,11 @@ def siteSetup(context):
         return
 
     site = context.getSite()
+    qi = getToolByName(site, 'portal_quickinstaller')
+    wf = getToolByName(site, 'portal_workflow')    
 
     # Install EasyShop product
 
-    qi = getToolByName(site, 'portal_quickinstaller')
     for p in INSTALL_PRODUCTS:
         if not qi.isProductInstalled(p):
             qi.installProduct(p)
@@ -24,7 +30,6 @@ def siteSetup(context):
         shop = site.shop
         shop.title = 'Shop'
         shop.shopOwner = 'admin'
-        wf = getToolByName(site, 'portal_workflow')    
         if wf.getInfoFor(shop,'review_state','') != 'published':
             wf.doActionFor(shop,'publish',comment='site setup')
 
@@ -36,9 +41,23 @@ def siteSetup(context):
             wf.doActionFor(ob,'retract',comment='site setup')
 
 
-# Called via hackery in __init__.py
+def contentSetup(app):
+    app.manage_addProduct['CMFPlone'].addPloneSite(id='site',
+                                                   extension_ids=['koehsel.policy:default'])
+
+
+# Called via hackery in __init__.py on every site start
 def appInit(app):
     try: app.site
     except AttributeError:
-        app.manage_addProduct['CMFPlone'].addPloneSite(id='site',
-                                                       extension_ids=['koehsel.policy:default'])
+
+        from Testing.makerequest import makerequest
+        from AccessControl.SecurityManagement import newSecurityManager
+        import transaction, AccessControl
+
+        # Call 'contentSetup' as SITE_OWNER user with a valid REQUEST
+        req = makerequest(app)
+        newSecurityManager(req.REQUEST, app.acl_users.getUser(SITE_OWNER).__of__(app.acl_users))
+        contentSetup(req)
+        transaction.commit()
+        newSecurityManager(None, AccessControl.User.system)