[Testbot] Plone 5.0 - Python 2.7 - Build # 2065 - Still failing! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Sat Mar 29 20:27:39 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 2065 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/2065/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-03-29T18:03:20+01:00
Author: Daniel Widerin () <daniel.widerin at zumtobelgroup.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/b767ad9d68b524d8c893185977b00cc5b6944fb1
Remove page templates and form scripts, fixes #90
Files changed:
M CHANGES.rst
D Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy
D Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy.metadata
D Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy
D Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy.metadata
D Products/CMFPlone/skins/plone_forms/select_default_page.cpt
D Products/CMFPlone/skins/plone_forms/select_default_page.cpt.metadata
D Products/CMFPlone/skins/plone_forms/select_default_view.cpt
D Products/CMFPlone/skins/plone_forms/select_default_view.cpt.metadata
diff --git a/CHANGES.rst b/CHANGES.rst
index 4fb79a1..5ea5334 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -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)
------------------
diff --git a/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy b/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy
deleted file mode 100644
index 651eb80..0000000
--- a/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy
+++ /dev/null
@@ -1,28 +0,0 @@
-## Script (Python) "selectDefaultPage"
-##title=Helper method to select a default page for a folder view
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind state=state
-##bind subpath=traverse_subpath
-##parameters=objectId=None
-
-from Products.CMFPlone import PloneMessageFactory as _
-
-if not objectId:
- context.plone_utils.addPortalMessage(_(u'Please select an item to use.'),
- 'error')
- return state.set(status='missing')
-
-if not objectId in context.objectIds():
- message = _(u'There is no object with short name ${name} in this folder.',
- mapping={u'name': objectId})
-
- context.plone_utils.addPortalMessage(message, 'error')
- return state.set(status='failure')
-
-context.setDefaultPage(objectId)
-
-context.plone_utils.addPortalMessage(_(u'View changed.'))
-return state
diff --git a/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy.metadata b/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy.metadata
deleted file mode 100644
index c84d221..0000000
--- a/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy.metadata
+++ /dev/null
@@ -1,7 +0,0 @@
-[default]
-title = Select default page
-
-[actions]
-action.success=redirect_to_action:string:view
-action.failure=traverse_to_action:string:view
-action.missing=traverse_to:string:select_default_page
diff --git a/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy b/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy
deleted file mode 100644
index 34dbe02..0000000
--- a/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy
+++ /dev/null
@@ -1,15 +0,0 @@
-## Script (Python) "selectViewTemplate"
-##title=Helper method to select a view template
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind state=state
-##bind subpath=traverse_subpath
-##parameters=templateId
-
-from Products.CMFPlone import PloneMessageFactory as _
-context.setLayout(templateId)
-
-context.plone_utils.addPortalMessage(_(u'View changed.'))
-return state
diff --git a/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy.metadata b/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy.metadata
deleted file mode 100644
index 81ce09c..0000000
--- a/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy.metadata
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-title = Select layout
-
-[actions]
-action.failure=redirect_to_action:string:view
-action.success=redirect_to_action:string:view
\ No newline at end of file
diff --git a/Products/CMFPlone/skins/plone_forms/select_default_page.cpt b/Products/CMFPlone/skins/plone_forms/select_default_page.cpt
deleted file mode 100644
index 9ab35ad..0000000
--- a/Products/CMFPlone/skins/plone_forms/select_default_page.cpt
+++ /dev/null
@@ -1,104 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
- metal:use-macro="context/main_template/macros/master"
- i18n:domain="plone">
-
-<metal:block fill-slot="top_slot"
- tal:define="dummy python:request.set('disable_border',1)" />
-
- <body>
-
- <metal:main fill-slot="main">
-
- <h1 class="documentFirstHeading"
- i18n:translate="heading_select_default_page">Select default page</h1>
-
- <div class="documentDescription" i18n:translate="description_select_default_page">
- Please select item which will be displayed as the default page of the
- folder.
- </div>
- <div id="content-core">
- <form name="default_page_form"
- action="."
- method="post"
- tal:attributes="action string:${context/@@plone_context_state/object_url}/${template/getId}">
-
- <input type="hidden" name="form.submitted" value="1"/>
-
- <tal:items define="availableTypes site_properties/default_page_types | python:[];
- use_view_action site_properties/typesUseViewActionInListings|python:[];
- items python:[item for item in context.getFolderContents() if
- (not item.is_folderish or item.portal_type in availableTypes) and
- item.portal_type not in use_view_action];
- cur_page context/getDefaultPage|nothing;
- ploneview nocall:context/@@plone">
- <tal:hasItems condition="items"
- define="n_items python:len(items);
- member context/@@plone_portal_state/member;
- portal_visible_ids context/portal_properties/site_properties/visible_ids|nothing;
- member_visible_ids python:member.getProperty('visible_ids', context.portal_memberdata.getProperty('visible_ids'))">
- <div>
- <article tal:repeat="item items">
- <header tal:define="normalized_type python:ploneview.normalizeString(item.portal_type);
- item_icon python:ploneview.getIcon(item);
- item_id python:'(%s)' % item.getId if (portal_visible_ids and member_visible_ids) else ''">
- <input type="radio" name="objectId" value=""
- tal:attributes="value item/getId;
- id item/getId;
- checked python:test(n_items==1 or item.getId==cur_page, 'checked', None);"/>
- <img tal:condition="nocall:item_icon"
- tal:replace="structure item_icon/html_tag" />
- <label tal:attributes="for item/getId;
- class string:contenttype-${normalized_type}"
- tal:content="string:${item/pretty_title_or_id} $item_id">
- Item title
- </label>
- </header>
- <p tal:content="item/Description">
- Item Description
- </p>
- </article>
-
- </div>
-
- <div class="formControls">
- <input class="context"
- type="submit"
- name="form.button.Save"
- value="Save"
- i18n:attributes="value label_save;"
- />
- <input class="context"
- type="submit"
- name="form.button.Cancel"
- value="Cancel"
- i18n:attributes="value label_cancel;"
- />
- </div>
-
- </tal:hasItems>
- <tal:noitems condition="not:nocall:items">
- <div i18n:translate="help_no_selectable_default_pages">
- There are no items in this folder that can be selected as
- a default view page.
- </div>
- <div class="formControls">
- <input class="context"
- type="submit"
- name="form.button.Cancel"
- value="Ok"
- i18n:attributes="value label_ok;"
- />
- </div>
- </tal:noitems>
- </tal:items>
-
- </form>
- </div>
-
- </metal:main>
-
- </body>
-</html>
diff --git a/Products/CMFPlone/skins/plone_forms/select_default_page.cpt.metadata b/Products/CMFPlone/skins/plone_forms/select_default_page.cpt.metadata
deleted file mode 100644
index 249734a..0000000
--- a/Products/CMFPlone/skins/plone_forms/select_default_page.cpt.metadata
+++ /dev/null
@@ -1,7 +0,0 @@
-[default]
-title = Select default page
-
-[actions]
-action.success..Cancel=redirect_to_action:string:view
-action.success..Save=traverse_to:string:saveDefaultPage
-action.success=traverse_to:string:saveDefaultPage
diff --git a/Products/CMFPlone/skins/plone_forms/select_default_view.cpt b/Products/CMFPlone/skins/plone_forms/select_default_view.cpt
deleted file mode 100644
index 9e935f7..0000000
--- a/Products/CMFPlone/skins/plone_forms/select_default_view.cpt
+++ /dev/null
@@ -1,95 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
- metal:use-macro="context/main_template/macros/master"
- i18n:domain="plone">
-
-<metal:block fill-slot="top_slot"
- tal:define="dummy python:request.set('disable_border',1)" />
-
- <body>
-
- <metal:main fill-slot="main">
-
- <h1 class="documentFirstHeading"
- i18n:translate="heading_select_default_view">Select default view</h1>
-
- <div class="documentDescription" i18n:translate="description_select_default_view">
- Please select which template should be used as the default view of the
- folder.
- </div>
-
- <div id="content-core">
- <form name="default_view_form"
- action="."
- method="post"
- tal:define="context_state context/@@plone_context_state;"
- tal:attributes="action string:${context_state/object_url}/${template/getId}">
-
- <input type="hidden" name="form.submitted" value="1"/>
-
- <div tal:define="vocab context/getAvailableLayouts;
- actualLayout context/getLayout|nothing;
- selectedLayout python:not context_state.is_default_page() and actualLayout or '';">
- <tal:item repeat="layout vocab">
- <tal:vars define="value python:layout[0];
- display python:layout[1];">
- <input type="radio" class="noborder" name="templateId" value=""
- tal:attributes="value value;
- id value;
- disabled python:value==selectedLayout"/>
- <label for="" tal:content="display"
- i18n:translate=""
- tal:attributes="for value">
- Layout name
- </label>
- <span class="discreet"
- tal:condition="python:value==selectedLayout"
- i18n:translate="label_current">(current)</span><br />
- </tal:vars>
- </tal:item>
- <p tal:condition="context/canSelectDefaultPage">
- <tal:selected condition="python:selectedLayout != ''">
- <span i18n:translate="label_or">or</span>
- <a title="Select an item to be used as default view in this folder" href="#" class="selected"
- tal:attributes="href string:${context/absolute_url}/select_default_page;"
- i18n:attributes="title title_select_default_page;"
- i18n:translate="label_choose_content_item">
- Choose a content item…
- </a>
- </tal:selected>
- <tal:selected condition="python:selectedLayout == ''">
- <span i18n:translate="label_or">or</span>
- <a title="Change the item used as default view in this folder" href="#" class="selected"
- tal:attributes="href string:${context/absolute_url}/select_default_page;"
- i18n:attributes="title title_change_default_view_item;"
- i18n:translate="label_select_content_item">
- Select a content item…
- </a>
- </tal:selected>
- </p>
- </div>
-
- <div class="formControls">
- <input class="context"
- type="submit"
- name="form.button.Save"
- value="Save"
- i18n:attributes="value label_save;"
- />
- <input class="standalone"
- type="submit"
- name="form.button.Cancel"
- value="Cancel"
- i18n:attributes="value label_cancel;"
- />
- </div>
-
- </form>
- </div>
-
- </metal:main>
-
- </body>
-</html>
diff --git a/Products/CMFPlone/skins/plone_forms/select_default_view.cpt.metadata b/Products/CMFPlone/skins/plone_forms/select_default_view.cpt.metadata
deleted file mode 100644
index 5ef5e08..0000000
--- a/Products/CMFPlone/skins/plone_forms/select_default_view.cpt.metadata
+++ /dev/null
@@ -1,7 +0,0 @@
-[default]
-title = Select default view
-
-[actions]
-action.success..Cancel=redirect_to_action:string:view
-action.success..Save=traverse_to:string:selectViewTemplate
-action.success=traverse_to:string:selectViewTemplate
Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-03-29T19:17:53+01:00
Author: Daniel Widerin () <daniel.widerin at zumtobelgroup.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/702d50d6883e78b2d81b469f87cae5704a65551d
Fix tests
Files changed:
M Products/CMFPlone/tests/testPloneView.py
diff --git a/Products/CMFPlone/tests/testPloneView.py b/Products/CMFPlone/tests/testPloneView.py
index 20b4935..521e6ec 100644
--- a/Products/CMFPlone/tests/testPloneView.py
+++ b/Products/CMFPlone/tests/testPloneView.py
@@ -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)
@@ -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())
@@ -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())
@@ -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)
Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-03-29T20:38:37+01:00
Author: Daniel Widerin () <daniel.widerin at zumtobelgroup.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/99238698e0dbe083786de3d0690bf66d9b6e61e7
Fix tests
Files changed:
M Products/CMFPlone/tests/browser_collection_views.txt
diff --git a/Products/CMFPlone/tests/browser_collection_views.txt b/Products/CMFPlone/tests/browser_collection_views.txt
index 03fe28f..0413b45 100644
--- a/Products/CMFPlone/tests/browser_collection_views.txt
+++ b/Products/CMFPlone/tests/browser_collection_views.txt
@@ -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)
Lets check the folder_listing (Standard view):
Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-03-29T20:57:45+01:00
Author: Philip Bauer (pbauer) <bauer at starzel.de>
Commit: https://github.com/plone/Products.CMFPlone/commit/b34e4ba4ba2a43f3c5f812dcc2df62907a311070
Merge pull request #199 from plone/plip-13260-select-default-page-and-view
Remove page templates and form scripts
Files changed:
M CHANGES.rst
M Products/CMFPlone/tests/browser_collection_views.txt
M Products/CMFPlone/tests/testPloneView.py
D Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy
D Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy.metadata
D Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy
D Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy.metadata
D Products/CMFPlone/skins/plone_forms/select_default_page.cpt
D Products/CMFPlone/skins/plone_forms/select_default_page.cpt.metadata
D Products/CMFPlone/skins/plone_forms/select_default_view.cpt
D Products/CMFPlone/skins/plone_forms/select_default_view.cpt.metadata
diff --git a/CHANGES.rst b/CHANGES.rst
index 4fb79a1..5ea5334 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -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)
------------------
diff --git a/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy b/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy
deleted file mode 100644
index 651eb80..0000000
--- a/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy
+++ /dev/null
@@ -1,28 +0,0 @@
-## Script (Python) "selectDefaultPage"
-##title=Helper method to select a default page for a folder view
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind state=state
-##bind subpath=traverse_subpath
-##parameters=objectId=None
-
-from Products.CMFPlone import PloneMessageFactory as _
-
-if not objectId:
- context.plone_utils.addPortalMessage(_(u'Please select an item to use.'),
- 'error')
- return state.set(status='missing')
-
-if not objectId in context.objectIds():
- message = _(u'There is no object with short name ${name} in this folder.',
- mapping={u'name': objectId})
-
- context.plone_utils.addPortalMessage(message, 'error')
- return state.set(status='failure')
-
-context.setDefaultPage(objectId)
-
-context.plone_utils.addPortalMessage(_(u'View changed.'))
-return state
diff --git a/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy.metadata b/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy.metadata
deleted file mode 100644
index c84d221..0000000
--- a/Products/CMFPlone/skins/plone_form_scripts/saveDefaultPage.cpy.metadata
+++ /dev/null
@@ -1,7 +0,0 @@
-[default]
-title = Select default page
-
-[actions]
-action.success=redirect_to_action:string:view
-action.failure=traverse_to_action:string:view
-action.missing=traverse_to:string:select_default_page
diff --git a/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy b/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy
deleted file mode 100644
index 34dbe02..0000000
--- a/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy
+++ /dev/null
@@ -1,15 +0,0 @@
-## Script (Python) "selectViewTemplate"
-##title=Helper method to select a view template
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind state=state
-##bind subpath=traverse_subpath
-##parameters=templateId
-
-from Products.CMFPlone import PloneMessageFactory as _
-context.setLayout(templateId)
-
-context.plone_utils.addPortalMessage(_(u'View changed.'))
-return state
diff --git a/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy.metadata b/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy.metadata
deleted file mode 100644
index 81ce09c..0000000
--- a/Products/CMFPlone/skins/plone_form_scripts/selectViewTemplate.cpy.metadata
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-title = Select layout
-
-[actions]
-action.failure=redirect_to_action:string:view
-action.success=redirect_to_action:string:view
\ No newline at end of file
diff --git a/Products/CMFPlone/skins/plone_forms/select_default_page.cpt b/Products/CMFPlone/skins/plone_forms/select_default_page.cpt
deleted file mode 100644
index 9ab35ad..0000000
--- a/Products/CMFPlone/skins/plone_forms/select_default_page.cpt
+++ /dev/null
@@ -1,104 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
- metal:use-macro="context/main_template/macros/master"
- i18n:domain="plone">
-
-<metal:block fill-slot="top_slot"
- tal:define="dummy python:request.set('disable_border',1)" />
-
- <body>
-
- <metal:main fill-slot="main">
-
- <h1 class="documentFirstHeading"
- i18n:translate="heading_select_default_page">Select default page</h1>
-
- <div class="documentDescription" i18n:translate="description_select_default_page">
- Please select item which will be displayed as the default page of the
- folder.
- </div>
- <div id="content-core">
- <form name="default_page_form"
- action="."
- method="post"
- tal:attributes="action string:${context/@@plone_context_state/object_url}/${template/getId}">
-
- <input type="hidden" name="form.submitted" value="1"/>
-
- <tal:items define="availableTypes site_properties/default_page_types | python:[];
- use_view_action site_properties/typesUseViewActionInListings|python:[];
- items python:[item for item in context.getFolderContents() if
- (not item.is_folderish or item.portal_type in availableTypes) and
- item.portal_type not in use_view_action];
- cur_page context/getDefaultPage|nothing;
- ploneview nocall:context/@@plone">
- <tal:hasItems condition="items"
- define="n_items python:len(items);
- member context/@@plone_portal_state/member;
- portal_visible_ids context/portal_properties/site_properties/visible_ids|nothing;
- member_visible_ids python:member.getProperty('visible_ids', context.portal_memberdata.getProperty('visible_ids'))">
- <div>
- <article tal:repeat="item items">
- <header tal:define="normalized_type python:ploneview.normalizeString(item.portal_type);
- item_icon python:ploneview.getIcon(item);
- item_id python:'(%s)' % item.getId if (portal_visible_ids and member_visible_ids) else ''">
- <input type="radio" name="objectId" value=""
- tal:attributes="value item/getId;
- id item/getId;
- checked python:test(n_items==1 or item.getId==cur_page, 'checked', None);"/>
- <img tal:condition="nocall:item_icon"
- tal:replace="structure item_icon/html_tag" />
- <label tal:attributes="for item/getId;
- class string:contenttype-${normalized_type}"
- tal:content="string:${item/pretty_title_or_id} $item_id">
- Item title
- </label>
- </header>
- <p tal:content="item/Description">
- Item Description
- </p>
- </article>
-
- </div>
-
- <div class="formControls">
- <input class="context"
- type="submit"
- name="form.button.Save"
- value="Save"
- i18n:attributes="value label_save;"
- />
- <input class="context"
- type="submit"
- name="form.button.Cancel"
- value="Cancel"
- i18n:attributes="value label_cancel;"
- />
- </div>
-
- </tal:hasItems>
- <tal:noitems condition="not:nocall:items">
- <div i18n:translate="help_no_selectable_default_pages">
- There are no items in this folder that can be selected as
- a default view page.
- </div>
- <div class="formControls">
- <input class="context"
- type="submit"
- name="form.button.Cancel"
- value="Ok"
- i18n:attributes="value label_ok;"
- />
- </div>
- </tal:noitems>
- </tal:items>
-
- </form>
- </div>
-
- </metal:main>
-
- </body>
-</html>
diff --git a/Products/CMFPlone/skins/plone_forms/select_default_page.cpt.metadata b/Products/CMFPlone/skins/plone_forms/select_default_page.cpt.metadata
deleted file mode 100644
index 249734a..0000000
--- a/Products/CMFPlone/skins/plone_forms/select_default_page.cpt.metadata
+++ /dev/null
@@ -1,7 +0,0 @@
-[default]
-title = Select default page
-
-[actions]
-action.success..Cancel=redirect_to_action:string:view
-action.success..Save=traverse_to:string:saveDefaultPage
-action.success=traverse_to:string:saveDefaultPage
diff --git a/Products/CMFPlone/skins/plone_forms/select_default_view.cpt b/Products/CMFPlone/skins/plone_forms/select_default_view.cpt
deleted file mode 100644
index 9e935f7..0000000
--- a/Products/CMFPlone/skins/plone_forms/select_default_view.cpt
+++ /dev/null
@@ -1,95 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
- metal:use-macro="context/main_template/macros/master"
- i18n:domain="plone">
-
-<metal:block fill-slot="top_slot"
- tal:define="dummy python:request.set('disable_border',1)" />
-
- <body>
-
- <metal:main fill-slot="main">
-
- <h1 class="documentFirstHeading"
- i18n:translate="heading_select_default_view">Select default view</h1>
-
- <div class="documentDescription" i18n:translate="description_select_default_view">
- Please select which template should be used as the default view of the
- folder.
- </div>
-
- <div id="content-core">
- <form name="default_view_form"
- action="."
- method="post"
- tal:define="context_state context/@@plone_context_state;"
- tal:attributes="action string:${context_state/object_url}/${template/getId}">
-
- <input type="hidden" name="form.submitted" value="1"/>
-
- <div tal:define="vocab context/getAvailableLayouts;
- actualLayout context/getLayout|nothing;
- selectedLayout python:not context_state.is_default_page() and actualLayout or '';">
- <tal:item repeat="layout vocab">
- <tal:vars define="value python:layout[0];
- display python:layout[1];">
- <input type="radio" class="noborder" name="templateId" value=""
- tal:attributes="value value;
- id value;
- disabled python:value==selectedLayout"/>
- <label for="" tal:content="display"
- i18n:translate=""
- tal:attributes="for value">
- Layout name
- </label>
- <span class="discreet"
- tal:condition="python:value==selectedLayout"
- i18n:translate="label_current">(current)</span><br />
- </tal:vars>
- </tal:item>
- <p tal:condition="context/canSelectDefaultPage">
- <tal:selected condition="python:selectedLayout != ''">
- <span i18n:translate="label_or">or</span>
- <a title="Select an item to be used as default view in this folder" href="#" class="selected"
- tal:attributes="href string:${context/absolute_url}/select_default_page;"
- i18n:attributes="title title_select_default_page;"
- i18n:translate="label_choose_content_item">
- Choose a content item…
- </a>
- </tal:selected>
- <tal:selected condition="python:selectedLayout == ''">
- <span i18n:translate="label_or">or</span>
- <a title="Change the item used as default view in this folder" href="#" class="selected"
- tal:attributes="href string:${context/absolute_url}/select_default_page;"
- i18n:attributes="title title_change_default_view_item;"
- i18n:translate="label_select_content_item">
- Select a content item…
- </a>
- </tal:selected>
- </p>
- </div>
-
- <div class="formControls">
- <input class="context"
- type="submit"
- name="form.button.Save"
- value="Save"
- i18n:attributes="value label_save;"
- />
- <input class="standalone"
- type="submit"
- name="form.button.Cancel"
- value="Cancel"
- i18n:attributes="value label_cancel;"
- />
- </div>
-
- </form>
- </div>
-
- </metal:main>
-
- </body>
-</html>
diff --git a/Products/CMFPlone/skins/plone_forms/select_default_view.cpt.metadata b/Products/CMFPlone/skins/plone_forms/select_default_view.cpt.metadata
deleted file mode 100644
index 5ef5e08..0000000
--- a/Products/CMFPlone/skins/plone_forms/select_default_view.cpt.metadata
+++ /dev/null
@@ -1,7 +0,0 @@
-[default]
-title = Select default view
-
-[actions]
-action.success..Cancel=redirect_to_action:string:view
-action.success..Save=traverse_to:string:selectViewTemplate
-action.success=traverse_to:string:selectViewTemplate
diff --git a/Products/CMFPlone/tests/browser_collection_views.txt b/Products/CMFPlone/tests/browser_collection_views.txt
index 03fe28f..0413b45 100644
--- a/Products/CMFPlone/tests/browser_collection_views.txt
+++ b/Products/CMFPlone/tests/browser_collection_views.txt
@@ -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)
Lets check the folder_listing (Standard view):
diff --git a/Products/CMFPlone/tests/testPloneView.py b/Products/CMFPlone/tests/testPloneView.py
index 20b4935..521e6ec 100644
--- a/Products/CMFPlone/tests/testPloneView.py
+++ b/Products/CMFPlone/tests/testPloneView.py
@@ -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)
@@ -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())
@@ -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())
@@ -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)
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 37345 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140329/ddfdbc8c/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 21667 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140329/ddfdbc8c/attachment-0003.obj>
More information about the Testbot
mailing list