[Plone-cvs] r32153 - in Plone/trunk: Products/CMFPlone/browser Products/CMFPlone/patches docs

[David G. <svn...@pl...>]

Author: davisagli
Date: Mon Nov 30 06:32:32 2009
New Revision: 32153

Modified:
   Plone/trunk/Products/CMFPlone/browser/admin.zcml
   Plone/trunk/Products/CMFPlone/patches/addzmiplonesite.py
   Plone/trunk/docs/CHANGES.txt
Log:
restore the ability to add Plone sites within ZODB mountpoints. refs #9880

Modified: Plone/trunk/Products/CMFPlone/browser/admin.zcml
==============================================================================
--- Plone/trunk/Products/CMFPlone/browser/admin.zcml	(original)
+++ Plone/trunk/Products/CMFPlone/browser/admin.zcml	Mon Nov 30 06:32:32 2009
@@ -17,6 +17,14 @@
       />
 
   <browser:page
+      for="OFS.Folder.Folder"
+      name="plone-addsite"
+      class=".admin.AddPloneSite"
+      permission="zope2.ViewManagementScreens"
+      template="templates/plone-addsite.pt"
+      />
+
+  <browser:page
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       name="plone-upgrade"
       class=".admin.Upgrade"

Modified: Plone/trunk/Products/CMFPlone/patches/addzmiplonesite.py
==============================================================================
--- Plone/trunk/Products/CMFPlone/patches/addzmiplonesite.py	(original)
+++ Plone/trunk/Products/CMFPlone/patches/addzmiplonesite.py	Mon Nov 30 06:32:32 2009
@@ -1,7 +1,7 @@
 from OFS.ObjectManager import ObjectManager
 
 ADD_PLONE_SITE_HTML = '''
-<dtml-if "_.len(this().getPhysicalPath()) == 1">
+<dtml-if "_.len(this().getPhysicalPath()) == 1 or this().meta_type == 'Folder' and 'PloneSite' not in [o.__class__.__name__ for o in this().aq_chain]">
   <!-- Add Plone site action-->
   <form method="get" 
         action="&dtml-URL1;/@@plone-addsite"

Modified: Plone/trunk/docs/CHANGES.txt
==============================================================================
--- Plone/trunk/docs/CHANGES.txt	(original)
+++ Plone/trunk/docs/CHANGES.txt	Mon Nov 30 06:32:32 2009
@@ -8,6 +8,10 @@
 4.0a2 - Unreleased
 ------------------
 
+- Restore the ability to add Plone sites within ZODB mountpoints (and other
+  OFS folders).
+  [davisagli]
+
 - Move prefs_navigation_form to plone.app.controlpanel as 
   @@navigation-controlpanel. The form and its cpy script have been deprecated.
   [esteele]