[fc] Repository: plone.app.content

Branch: refs/heads/master Date: 2019-10-15T22:23:22+02:00 Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com> Commit: plone/plone.app.content@13f3316 Follow default_page_types setting when showing the items that can be selected as default page Files changed: A news/182.bugfix M plone/app/content/browser/selection.py M plone/app/content/tests/test_selectdefaultpage.py Repository: plone.app.content Branch: refs/heads/master Date: 2019-10-15T23:52:06+02:00 Author: Maurits van Rees (mauritsvanrees) <m.van.rees@zestsoftware.nl> Commit: plone/plone.app.content@7d51404 Merge pull request #184 from plone/erral-issue-182 Follow default_page_types setting when showing the items that can be selected as default page Files changed: A news/182.bugfix M plone/app/content/browser/selection.py M plone/app/content/tests/test_selectdefaultpage.py
plone · Oct 15, 2019 · 6a56449 · 6a56449
1 parent 483bfd7
commit 6a56449
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,34 +1,36 @@
-Repository: Products.CMFPlone
+Repository: plone.app.content
 
 
 Branch: refs/heads/master
-Date: 2019-10-15T22:24:10+02:00
+Date: 2019-10-15T22:23:22+02:00
 Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
-Commit: https://github.com/plone/Products.CMFPlone/commit/ebf74901e5c241c2b8596426986e00cbf1606051
+Commit: https://github.com/plone/plone.app.content/commit/13f331620ddd9b94a3664d64e467060bc6abda9d
 
-add Collection to the default_page_types setting
+Follow default_page_types setting when showing the items that can be selected as default page
 
 Files changed:
-A news/2956.bugfix
-M Products/CMFPlone/interfaces/controlpanel.py
+A news/182.bugfix
+M plone/app/content/browser/selection.py
+M plone/app/content/tests/test_selectdefaultpage.py
 
-b"diff --git a/Products/CMFPlone/interfaces/controlpanel.py b/Products/CMFPlone/interfaces/controlpanel.py\nindex c2408241a..280a400ac 100644\n--- a/Products/CMFPlone/interfaces/controlpanel.py\n+++ b/Products/CMFPlone/interfaces/controlpanel.py\n@@ -1265,6 +1265,7 @@ class ITypesSchema(Interface):\n             u'Document',\n             u'Event',\n             u'News Item',\n+            u'Collection',\n         ],\n         value_type=schema.TextLine()\n     )\ndiff --git a/news/2956.bugfix b/news/2956.bugfix\nnew file mode 100644\nindex 000000000..58973ded7\n--- /dev/null\n+++ b/news/2956.bugfix\n@@ -0,0 +1,2 @@\n+Add Collection to the default_page_types list\n+[erral]\n"
+b'diff --git a/news/182.bugfix b/news/182.bugfix\nnew file mode 100644\nindex 0000000..7303a98\n--- /dev/null\n+++ b/news/182.bugfix\n@@ -0,0 +1 @@\n+Follow default_page_types setting when showing the items that can be selected as default page [erral]\n\\ No newline at end of file\ndiff --git a/plone/app/content/browser/selection.py b/plone/app/content/browser/selection.py\nindex 057eae1..89ac24f 100644\n--- a/plone/app/content/browser/selection.py\n+++ b/plone/app/content/browser/selection.py\n@@ -125,5 +125,6 @@ def get_selectable_items(self):\n                     # Disallow folderish types if you can\'t add any content.\n                     # To override you have to add type to default_page_types\n                     continue\n-            results.append(brain)\n+\n+                results.append(brain)\n         return results\ndiff --git a/plone/app/content/tests/test_selectdefaultpage.py b/plone/app/content/tests/test_selectdefaultpage.py\nindex 76779f4..b287dc0 100644\n--- a/plone/app/content/tests/test_selectdefaultpage.py\n+++ b/plone/app/content/tests/test_selectdefaultpage.py\n@@ -18,6 +18,10 @@\n             \'title\': \'Test Document\',\n             \'description\': \'Test Document Description\'}\n \n+NEWSITEM = {\'id\': \'testnews\',\n+            \'title\': \'Test News Item\',\n+            \'description\': \'Test News Item Description\'}\n+\n \n class SelectDefaultPageDXTestCase(unittest.TestCase):\n \n@@ -59,6 +63,16 @@ def _createDocument(self, context):\n         # doc.setExcludeFromNav(True)\n         return doc\n \n+    def _createNewsItem(self, context):\n+        context.invokeFactory(id=NEWSITEM[\'id\'], type_name=\'News Item\')\n+        doc = getattr(context, NEWSITEM[\'id\'])\n+        doc.setTitle(NEWSITEM[\'title\'])\n+        doc.setDescription(NEWSITEM[\'description\'])\n+        doc.reindexObject()\n+        # we don\'t want it in the navigation\n+        # doc.setExcludeFromNav(True)\n+        return doc\n+\n     def _create_structure(self):\n         setRoles(self.portal, TEST_USER_ID, [\'Manager\'])\n         folder = self._createFolder()\n@@ -111,6 +125,16 @@ def test_default_page_action_save(self):\n         self.assertEqual(self.browser.url, folder.absolute_url())\n         self.assertEqual(folder.getDefaultPage(), \'testdoc\')\n \n+    def test_selectable_types_filter(self):\n+        self.portal.portal_registry[\'plone.default_page_types\'] = [u\'News Item\']\n+        folder = self.portal.testfolder\n+        self._createNewsItem(folder)\n+\n+        view = folder.restrictedTraverse(\'@@select_default_page\')()\n+        self.assertTrue(\'id="testdoc"\' not in view)\n+        self.assertTrue(\'id="testnews"\' in view)\n+\n+\n \n if HAS_AT:\n     class SelectDefaultPageATTestCase(SelectDefaultPageDXTestCase):\n'
 
-Repository: Products.CMFPlone
+Repository: plone.app.content
 
 
 Branch: refs/heads/master
-Date: 2019-10-15T23:51:47+02:00
+Date: 2019-10-15T23:52:06+02:00
 Author: Maurits van Rees (mauritsvanrees) <m.van.rees@zestsoftware.nl>
-Commit: https://github.com/plone/Products.CMFPlone/commit/207b7b3cd9cfd1542d0ed27212f24029940ef960
+Commit: https://github.com/plone/plone.app.content/commit/7d51404f6db2d4826c184c1816c65674e851917e
 
-Merge pull request #2955 from plone/erral-issue-182-p.a.content
+Merge pull request #184 from plone/erral-issue-182
 
-add Collection to the default_page_types setting
+Follow default_page_types setting when showing the items that can be selected as default page
 
 Files changed:
-A news/2956.bugfix
-M Products/CMFPlone/interfaces/controlpanel.py
+A news/182.bugfix
+M plone/app/content/browser/selection.py
+M plone/app/content/tests/test_selectdefaultpage.py
 
-b"diff --git a/Products/CMFPlone/interfaces/controlpanel.py b/Products/CMFPlone/interfaces/controlpanel.py\nindex c2408241a..280a400ac 100644\n--- a/Products/CMFPlone/interfaces/controlpanel.py\n+++ b/Products/CMFPlone/interfaces/controlpanel.py\n@@ -1265,6 +1265,7 @@ class ITypesSchema(Interface):\n             u'Document',\n             u'Event',\n             u'News Item',\n+            u'Collection',\n         ],\n         value_type=schema.TextLine()\n     )\ndiff --git a/news/2956.bugfix b/news/2956.bugfix\nnew file mode 100644\nindex 000000000..58973ded7\n--- /dev/null\n+++ b/news/2956.bugfix\n@@ -0,0 +1,2 @@\n+Add Collection to the default_page_types list\n+[erral]\n"
+b'diff --git a/news/182.bugfix b/news/182.bugfix\nnew file mode 100644\nindex 0000000..7303a98\n--- /dev/null\n+++ b/news/182.bugfix\n@@ -0,0 +1 @@\n+Follow default_page_types setting when showing the items that can be selected as default page [erral]\n\\ No newline at end of file\ndiff --git a/plone/app/content/browser/selection.py b/plone/app/content/browser/selection.py\nindex 057eae1..89ac24f 100644\n--- a/plone/app/content/browser/selection.py\n+++ b/plone/app/content/browser/selection.py\n@@ -125,5 +125,6 @@ def get_selectable_items(self):\n                     # Disallow folderish types if you can\'t add any content.\n                     # To override you have to add type to default_page_types\n                     continue\n-            results.append(brain)\n+\n+                results.append(brain)\n         return results\ndiff --git a/plone/app/content/tests/test_selectdefaultpage.py b/plone/app/content/tests/test_selectdefaultpage.py\nindex 76779f4..b287dc0 100644\n--- a/plone/app/content/tests/test_selectdefaultpage.py\n+++ b/plone/app/content/tests/test_selectdefaultpage.py\n@@ -18,6 +18,10 @@\n             \'title\': \'Test Document\',\n             \'description\': \'Test Document Description\'}\n \n+NEWSITEM = {\'id\': \'testnews\',\n+            \'title\': \'Test News Item\',\n+            \'description\': \'Test News Item Description\'}\n+\n \n class SelectDefaultPageDXTestCase(unittest.TestCase):\n \n@@ -59,6 +63,16 @@ def _createDocument(self, context):\n         # doc.setExcludeFromNav(True)\n         return doc\n \n+    def _createNewsItem(self, context):\n+        context.invokeFactory(id=NEWSITEM[\'id\'], type_name=\'News Item\')\n+        doc = getattr(context, NEWSITEM[\'id\'])\n+        doc.setTitle(NEWSITEM[\'title\'])\n+        doc.setDescription(NEWSITEM[\'description\'])\n+        doc.reindexObject()\n+        # we don\'t want it in the navigation\n+        # doc.setExcludeFromNav(True)\n+        return doc\n+\n     def _create_structure(self):\n         setRoles(self.portal, TEST_USER_ID, [\'Manager\'])\n         folder = self._createFolder()\n@@ -111,6 +125,16 @@ def test_default_page_action_save(self):\n         self.assertEqual(self.browser.url, folder.absolute_url())\n         self.assertEqual(folder.getDefaultPage(), \'testdoc\')\n \n+    def test_selectable_types_filter(self):\n+        self.portal.portal_registry[\'plone.default_page_types\'] = [u\'News Item\']\n+        folder = self.portal.testfolder\n+        self._createNewsItem(folder)\n+\n+        view = folder.restrictedTraverse(\'@@select_default_page\')()\n+        self.assertTrue(\'id="testdoc"\' not in view)\n+        self.assertTrue(\'id="testnews"\' in view)\n+\n+\n \n if HAS_AT:\n     class SelectDefaultPageATTestCase(SelectDefaultPageDXTestCase):\n'