Remove propertiestool import step and usage of portal_properties.

plone · Jun 15, 2024 · c247a7a · c247a7a
1 parent de6520f
commit c247a7a
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 368 deletions.
diff --git a/Products/CMFPlone/browser/author.py b/Products/CMFPlone/browser/author.py
@@ -201,11 +201,7 @@ def home_folder(self, username):
         return self.membership_tool.getHomeFolder(id=username)
 
     def __call__(self):
-        self.portal_properties = getUtility(IPropertiesTool)
-
         self.portal_catalog = getToolByName(self.context, "portal_catalog")
-
-        # XXX: getUtility call does not work.
         self.membership_tool = getToolByName(self.context, "portal_membership")
 
         self.portal_state = getMultiAdapter(

diff --git a/Products/CMFPlone/browser/templates/ajax_main_template.pt b/Products/CMFPlone/browser/templates/ajax_main_template.pt
@@ -15,7 +15,6 @@
           dummy python: plone_layout.mark_view(view);
           portal_url python:portal_state.portal_url();
           checkPermission python:context.restrictedTraverse('portal_membership').checkPermission;
-          site_properties python:context.restrictedTraverse('portal_properties').site_properties;
           ajax_include_head python:request.get('ajax_include_head', False);
           ajax_load python:False;"
       i18n:domain="plone"

diff --git a/Products/CMFPlone/browser/templates/main_template.pt b/Products/CMFPlone/browser/templates/main_template.pt
@@ -15,7 +15,6 @@
           dummy python: plone_layout.mark_view(view);
           portal_url python:portal_state.portal_url();
           checkPermission python:context.restrictedTraverse('portal_membership').checkPermission;
-          site_properties python:context.restrictedTraverse('portal_properties').site_properties;
           ajax_include_head python:request.get('ajax_include_head', False);
           ajax_load python:False;"
       i18n:domain="plone"

diff --git a/Products/CMFPlone/exportimport/configure.zcml b/Products/CMFPlone/exportimport/configure.zcml
@@ -54,19 +54,9 @@
     <depends name="catalog" />
     <depends name="viewlets" />
     <depends name="controlpanel" />
-    <depends name="propertiestool" />
     <depends name="workflow" />
   </genericsetup:importStep>
 
-  <genericsetup:importStep
-      name="propertiestool"
-      title="Plone Properties"
-      description="Import plone properties tool and subobjects."
-      handler="Products.CMFPlone.exportimport.propertiestool.importPloneProperties"
-      >
-    <depends name="componentregistry" />
-  </genericsetup:importStep>
-
   <genericsetup:importStep
       name="update-workflow-rolemap"
       title="Update workflow role mappings"
@@ -105,48 +95,19 @@
       handler="Products.CMFPlone.exportimport.memberdata_properties.exportMemberDataProperties"
       />
 
-  <genericsetup:exportStep
-      name="propertiestool"
-      title="Plone Properties"
-      description="Export plone properties tool and subobjects."
-      handler="Products.CMFPlone.exportimport.propertiestool.exportPloneProperties"
-      />
-
   <genericsetup:exportStep
       name="viewlets"
       title="Viewlet Settings"
       description="Export viewlet settings"
       handler="plone.app.viewletmanager.exportimport.storage.exportViewletSettingsStorage"
       />
 
-  <adapter
-      factory=".propertiestool.PlonePropertiesToolXMLAdapter"
-      provides="Products.GenericSetup.interfaces.IBody"
-      for="plone.base.interfaces.IPropertiesTool
-           Products.GenericSetup.interfaces.ISetupEnviron"
-      />
-
-  <adapter
-      factory=".propertiestool.SimpleItemWithPropertiesXMLAdapter"
-      provides="Products.GenericSetup.interfaces.IBody"
-      for="plone.base.interfaces.ISimpleItemWithProperties
-           Products.GenericSetup.interfaces.ISetupEnviron"
-      />
-
   <adapter
       factory="Products.CMFCore.exportimport.content.StructureFolderWalkingAdapter"
       provides="Products.GenericSetup.interfaces.IFilesystemImporter"
       for="Products.CMFCore.interfaces.ISiteRoot"
       />
 
-  <adapter
-      factory=".propertiestool.SimpleItemWithPropertiesXMLAdapter"
-      provides="Products.GenericSetup.interfaces.IBody"
-      for="Products.CMFCore.interfaces.IMemberDataTool
-           Products.GenericSetup.interfaces.ISetupEnviron"
-      zcml:condition="not-installed Products.CMFCore.exportimport.memberdata"
-      />
-
   <adapter
       factory=".controlpanel.ControlPanelXMLAdapter"
       provides="Products.GenericSetup.interfaces.IBody"

diff --git a/Products/CMFPlone/exportimport/propertiestool.py b/Products/CMFPlone/exportimport/propertiestool.py
diff --git a/Products/CMFPlone/exportimport/tests/testPropertiesTool.py b/Products/CMFPlone/exportimport/tests/testPropertiesTool.py
diff --git a/Products/CMFPlone/profiles/default/componentregistry.xml b/Products/CMFPlone/profiles/default/componentregistry.xml
@@ -68,9 +68,6 @@
     <utility factory="plone.app.viewletmanager.storage.ViewletSettingsStorage"
              interface="plone.app.viewletmanager.interfaces.IViewletSettingsStorage"
     />
-    <utility interface="Products.CMFCore.interfaces.IPropertiesTool"
-             object="portal_properties"
-    />
     <utility interface="Products.CMFCore.interfaces.ISiteRoot"
              object=""
     />

diff --git a/Products/CMFPlone/profiles/default/propertiestool.xml b/Products/CMFPlone/profiles/default/propertiestool.xml
diff --git a/Products/CMFPlone/profiles/default/toolset.xml b/Products/CMFPlone/profiles/default/toolset.xml
@@ -42,9 +42,6 @@
   <required class="Products.CMFPlone.PasswordResetTool.PasswordResetTool"
             tool_id="portal_password_reset"
   />
-  <required class="Products.CMFPlone.PropertiesTool.PropertiesTool"
-            tool_id="portal_properties"
-  />
   <required class="Products.CMFPlone.RegistrationTool.RegistrationTool"
             tool_id="portal_registration"
   />

diff --git a/Products/CMFPlone/tests/testNavigationView.py b/Products/CMFPlone/tests/testNavigationView.py
@@ -121,29 +121,6 @@ def path(x):
         self.assertEqual(subfolder221map["item"].getPath(), path(subfolder221))
         self.assertEqual(len(subfolder221map["children"]), 0)
 
-    def testSitemapUnchangedWithTopLevel(self):
-        # Test that setting topLevel does not alter the sitemap
-        ntp = self.portal.portal_properties.navtree_properties
-        for topLevel in range(0, 5):
-            ntp.manage_changeProperties(topLevel=topLevel)
-            view = self.view_class(self.portal, self.request)
-            sitemap = view.siteMap()
-            self.assertEqual(
-                sitemap["children"][-1]["item"].getPath(), "/plone/folder2"
-            )
-
-    def testSitemapUnchangedWithBottomLevel(self):
-        # Test that setting bottomLevel does not alter the sitemap
-        ntp = self.portal.portal_properties.navtree_properties
-        for bottomLevel in range(0, 5):
-            ntp.manage_changeProperties(bottomLevel=bottomLevel)
-            view = self.view_class(self.portal, self.request)
-            sitemap = view.siteMap()
-            self.assertEqual(
-                sitemap["children"][-1]["item"].getPath(), "/plone/folder2"
-            )
-            self.assertTrue(len(sitemap["children"][-1]["children"]) > 0)
-
     def testSitemapWithNavigationRoot(self):
         self.navigation_settings.root = "/folder2"
         view = self.view_class(self.portal, self.request)