Skip to content

Commit

Permalink
Merge pull request #199 from plone/plip-13260-select-default-page-and…
Browse files Browse the repository at this point in the history
…-view

Remove page templates and form scripts
  • Loading branch information
pbauer committed Mar 29, 2014
2 parents 997fb3a + 9923869 commit b34e4ba
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 274 deletions.
6 changes: 6 additions & 0 deletions CHANGES.rst
Expand Up @@ -13,6 +13,12 @@ Changelog
https://github.com/plone/Products.CMFPlone/issues/163
[khink]

- PLIP 13260 remove templates and form scripts for
``select_default_page`` and ``select_default_view`` because they got
migrated to browser views. see:
https://github.com/plone/Products.CMFPlone/issues/90
[saily]


5.0a1 (2014-03-02)
------------------
Expand Down
28 changes: 0 additions & 28 deletions Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy

This file was deleted.

This file was deleted.

104 changes: 0 additions & 104 deletions Products/CMFPlone/skins/plone_forms/select_default_page.cpt

This file was deleted.

This file was deleted.

95 changes: 0 additions & 95 deletions Products/CMFPlone/skins/plone_forms/select_default_view.cpt

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion Products/CMFPlone/tests/browser_collection_views.txt
Expand Up @@ -38,7 +38,7 @@ Now let's login and visit the collection in the test browser:
>>> browser.getControl('Password').value = TEST_USER_PASSWORD
>>> browser.getControl('Log in').click()
>>> browser.open('http://nohost/plone/folder/collection')

>>> open('test.html', 'w').write(browser.contents)

This comment has been minimized.

Copy link
@davisagli

davisagli Mar 29, 2014

Member

Looks like a debugging aid that you forgot to remove?


Lets check the folder_listing (Standard view):

Expand Down
8 changes: 4 additions & 4 deletions Products/CMFPlone/tests/testPloneView.py
Expand Up @@ -43,7 +43,7 @@ def testIsDefaultPageInFolder(self):
view = Plone(self.folder.test, self.app.REQUEST)
self.assertFalse(view.isDefaultPageInFolder())
self.assertTrue(self.folder.canSelectDefaultPage())
self.folder.saveDefaultPage('test')
self.folder.setDefaultPage('test')
# re-create the view, because the old value is cached
self._invalidateRequestMemoizations()
view = Plone(self.folder.test, self.app.REQUEST)
Expand Down Expand Up @@ -75,7 +75,7 @@ def testIsFolderOrFolderDefaultPage(self):
view = Plone(self.folder.test, self.app.REQUEST)
self.assertFalse(view.isFolderOrFolderDefaultPage())
# Unless we make it the default view
self.folder.saveDefaultPage('test')
self.folder.setDefaultPage('test')
self._invalidateRequestMemoizations()
view = Plone(self.folder.test, self.app.REQUEST)
self.assertTrue(view.isFolderOrFolderDefaultPage())
Expand All @@ -98,7 +98,7 @@ def testIsPortalOrPortalDefaultPage(self):
view = Plone(self.portal.portal_test, self.app.REQUEST)
self.assertFalse(view.isPortalOrPortalDefaultPage())
# Unless we make it the default view
self.portal.saveDefaultPage('portal_test')
self.portal.setDefaultPage('portal_test')
self._invalidateRequestMemoizations()
view = Plone(self.portal.portal_test, self.app.REQUEST)
self.assertTrue(view.isPortalOrPortalDefaultPage())
Expand Down Expand Up @@ -129,7 +129,7 @@ def testGetCurrentFolder(self):

# And even a structural folder that is used as a default page
# returns its parent
self.folder.saveDefaultPage('ns_folder')
self.folder.setDefaultPage('ns_folder')
self._invalidateRequestMemoizations()
view = Plone(self.folder.ns_folder, self.app.REQUEST)
self.assertEqual(view.getCurrentFolder(), self.folder)
Expand Down

0 comments on commit b34e4ba

Please sign in to comment.