Merge pull request #281 from plone/rm-skins-scrip-usage

Remove usage of skins script
plone · May 17, 2024 · 190e7f6 · 190e7f6
2 parents cc77865 + 0b08a9b
commit 190e7f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/news/281.bugfix b/news/281.bugfix
@@ -0,0 +1 @@
+Remove usage of CMFPlone skins script [@jensens]
diff --git a/plone/app/content/browser/selection.py b/plone/app/content/browser/selection.py
@@ -100,9 +100,13 @@ def get_selectable_items(self):
         view_types = registry.get("plone.types_use_view_action_in_listings", [])
         default_page_types = registry.get("plone.default_page_types", [])
         portal_types = getToolByName(self.context, "portal_types")
+        portal_catalog = getToolByName(self.context, "portal_catalog")
 
         results = []
-        for brain in context.getFolderContents():
+        for brain in portal_catalog(
+            path={"query": context.absolute_url_path(), "depth": 1},
+            sort_on="getObjPositionInParent",
+        ):
             portal_type = brain.portal_type
             if portal_type in view_types:
                 # Skip files and images

diff --git a/plone/app/content/tests/test_actions.py b/plone/app/content/tests/test_actions.py
@@ -234,7 +234,7 @@ def test_default_page_updated_on_rename(self):
         self.browser.getControl(name="form.widgets.new_id").value = " ?renamed"
         self.browser.getControl(name="form.widgets.new_title").value = "Doc"
         self.browser.getControl(name="form.buttons.Rename").click()
-        self.assertEqual(folder.getFolderContents()[0].id, "renamed")
+        self.assertEqual(folder.contentIds()[0], "renamed")
         self.assertEqual(folder.getDefaultPage(), "renamed")
 
     def test_rename_form_cancel(self):