[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - synced view names with the names used in type Actions
Yvo Schubbe
cvs-admin at zope.org
Thu Jul 11 21:56:12 CEST 2013
Log message for revision 130266:
- synced view names with the names used in type Actions
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.rst
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/TODO.rst
U Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/configure.zcml
U Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/tests/discussion.txt
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Discussion_Item.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Document.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Favorite.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/File.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Image.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Link.xml
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/News_Item.xml
U Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
U Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23views.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -4,6 +4,8 @@
2.3.0 (unreleased)
------------------
+- browser views: Synced view names with the names used in type Actions.
+
- profiles and upgrade: Modified Method Aliases used in type Actions.
Added upgrade steps for default profile and views_support profile.
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.rst
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.rst 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.rst 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,8 +1,8 @@
Converting skins to views:
==========================
-[/] IFolderish @@view.html:
----------------------------
+[/] IFolderish @@view:
+----------------------
- [/] index_html.py -> FolderView
- [/, depends on local_pt and news_box] index_html_template.pt -> folder.pt
@@ -26,8 +26,8 @@
- [x] cmf.file -> FileAddView
- [x] cmf.image -> FileAddView
-[x] IFolderish @@edit.html:
----------------------------
+[x] IFolderish @@edit:
+----------------------
- [x] folder_contents.py -> ContentsView
- [x] folder_contents_template.pt -> folder_contents.pt
- [x] validateItemIds.py -> ContentsView.validate_items
@@ -49,78 +49,78 @@
- [x] folder_rename_control.py -> ContentsView.handle_rename_success
- [x] folder_rename_template.pt -> folder_rename.pt
-[x] IFolderish @@share.html:
-----------------------------
+[x] IFolderish @@share:
+-----------------------
- [x] folder_localrole_edit.py -> FolderShareView
- [x] folder_localrole_form.pt -> folder_share.pt
-[x] IMutableMinimalDublinCore @@properties.html:
-------------------------------------------------
+[x] IMutableMinimalDublinCore @@properties:
+-------------------------------------------
- [x] folder_edit_form.py -> MinimalMetadataEditView
- [x] folder_edit_template.pt -> formlib based
- [x] folder_edit_control.py -> formlib based
-[x] IMutableDublinCore @@properties.html:
------------------------------------------
+[x] IMutableDublinCore @@properties:
+------------------------------------
- [x] metadata_edit_form.py -> MetadataEditView
- [x] metadata_edit_template.pt -> formlib based
- [x] metadata_edit_control.py -> formlib based
-[x] IDocument @@view.html:
---------------------------
+[x] IDocument @@view:
+---------------------
- [x] document_view.py, newsitem_view.py -> DocumentView
- [x] document_view_template.pt -> document.pt
-[x] IDocument @@source.html:
-----------------------------
+[x] IDocument @@gethtml:
+------------------------
- [x] source_html.py -> SourceView
- [x] source_html_template.pt -> source.pt
-[x] IMutableDocument @@edit.html:
----------------------------------
+[x] IMutableDocument @@edit:
+----------------------------
- [x] document_edit_form.py -> DocumentEditView
- [x] document_edit_template.pt -> formlib based
- [x] validateHTML.py -> formlib based
- [x] validateTextFile.py -> formlib based
- [x] document_edit_control.py -> formlib based
-[x] IMutableNewsItem @@edit.html:
----------------------------------
+[x] IMutableNewsItem @@edit:
+----------------------------
- [x] newsitem_edit_form.py -> NewsItemEditView
- [x] newsitem_edit_template.pt -> formlib based
- [x] validateHTML.py -> formlib based
- [x] newsitem_edit_control.py -> formlib based
-[x] ILink @@view.html:
-----------------------
+[x] ILink @@view:
+-----------------
- [x] link_view.py, favorite_view.py -> LinkView
- [x] link_view_template.pt -> link.pt
-[x] IMutableLink @@edit.html:
------------------------------
+[x] IMutableLink @@edit:
+------------------------
- [x] link_edit_form.py -> LinkEditView
- [x] link_edit_template.pt -> formlib based
- [x] link_edit_control.py -> formlib based
-[x] IMutableFavorite @@edit.html:
----------------------------------
+[x] IMutableFavorite @@edit:
+----------------------------
- [x] link_edit_form.py -> FavoriteEditView
- [x] link_edit_template.pt -> formlib based
- [x] link_edit_control.py -> formlib based
-[x] IFile @@view.html:
-----------------------
+[x] IFile @@view:
+-----------------
- [x] file_view.py -> FileView
- [x] file_view_template.pt -> file.pt
-[x] IMutableFile @@edit.html:
------------------------------
+[x] IMutableFile @@edit:
+------------------------
- [x] file_edit_form.py, image_edit_form.py -> FileEditView
- [x] file_edit_template.pt, image_edit_template.pt -> formlib based
- [x] file_edit_control.py, image_edit_control.py -> formlib based
-[x] IImage @@view.html:
------------------------
+[x] IImage @@view:
+------------------
- [x] image_view.py -> ImageView
- [x] image_view_template.pt -> image.pt
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -5,7 +5,7 @@
<browser:page
for="Products.CMFCore.interfaces.IFolderish"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="view.html"
+ name="view"
class=".folder.FolderView"
template="folder.pt"
permission="zope2.View"
@@ -20,7 +20,7 @@
<browser:page
for="Products.CMFCore.interfaces.IFolderish"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="edit.html"
+ name="edit"
class=".folder.ContentsView"
permission="cmf.ListFolderContents"
/>
@@ -28,7 +28,7 @@
<browser:page
for="Products.CMFCore.interfaces.IFolderish"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="share.html"
+ name="share"
class=".folder.FolderShareView"
template="folder_share.pt"
permission="cmf.ChangeLocalRoles"
@@ -46,7 +46,7 @@
<browser:page
for="Products.CMFCore.interfaces.IMutableMinimalDublinCore"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="properties.html"
+ name="properties"
class=".metadata.MinimalMetadataEditView"
permission="zope2.ManageProperties"
/>
@@ -54,7 +54,7 @@
<browser:page
for="Products.CMFCore.interfaces.IMutableDublinCore"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="properties.html"
+ name="properties"
class=".metadata.MetadataEditView"
permission="cmf.ModifyPortalContent"
/>
@@ -67,7 +67,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IDocument"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="view.html"
+ name="view"
class=".document.DocumentView"
template="document.pt"
permission="zope2.View"
@@ -76,7 +76,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IDocument"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="source.html"
+ name="source"
class=".document.SourceView"
template="source.pt"
permission="cmf.ModifyPortalContent"
@@ -85,7 +85,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IMutableDocument"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="edit.html"
+ name="edit"
class=".document.DocumentEditView"
permission="cmf.ModifyPortalContent"
/>
@@ -93,7 +93,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IMutableNewsItem"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="edit.html"
+ name="edit"
class=".newsitem.NewsItemEditView"
permission="cmf.ModifyPortalContent"
/>
@@ -106,7 +106,7 @@
<browser:page
for="Products.CMFDefault.interfaces.ILink"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="view.html"
+ name="view"
class=".link.LinkView"
template="link.pt"
permission="zope2.View"
@@ -115,7 +115,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IMutableLink"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="edit.html"
+ name="edit"
class=".link.LinkEditView"
permission="cmf.ModifyPortalContent"
/>
@@ -128,7 +128,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IMutableFavorite"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="edit.html"
+ name="edit"
class=".favorite.FavoriteEditView"
permission="cmf.ModifyPortalContent"
/>
@@ -141,7 +141,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IFile"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="view.html"
+ name="view"
class=".file.FileView"
template="file.pt"
permission="zope2.View"
@@ -150,7 +150,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IMutableFile"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="edit.html"
+ name="edit"
class=".file.FileEditView"
permission="cmf.ModifyPortalContent"
/>
@@ -163,7 +163,7 @@
<browser:page
for="Products.CMFDefault.interfaces.IImage"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="view.html"
+ name="view"
class=".image.ImageView"
template="image.pt"
permission="zope2.View"
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -37,7 +37,7 @@
Use the folder contents form without input.
- >>> browser.open('http://localhost/site/myFolder/@@edit.html')
+ >>> browser.open('http://localhost/site/myFolder/@@edit')
>>> '[[cmf_default][Folder Contents: ]]' in browser.contents
True
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -6,7 +6,7 @@
>>> from zope.component.hooks import setSite
>>> setSite(app.site)
>>> ti = app.site.portal_types.Document
- >>> dummy = ti.setMethodAliases({'edit': '@@edit.html', 'gethtml': '@@source.html'})
+ >>> dummy = ti.setMethodAliases({'edit': '@@edit', 'gethtml': '@@source'})
>>> uf = app.site.acl_users
>>> _ignored = uf._doAddUser('mgr', 'mgrpw', ['Manager'], [])
>>> from Products.CMFDefault.Document import Document
@@ -25,7 +25,7 @@
Use the edit form with invalid input.
- >>> browser.open('http://localhost/site/myDocument/@@edit.html')
+ >>> browser.open('http://localhost/site/myDocument/@@edit')
>>> browser.getControl('[[cmf_default][Body]]').value = '<script>'
>>> browser.getControl('[[cmf_default][Change]]').click()
>>> '[[zope][There were errors]]' in browser.contents
@@ -42,13 +42,13 @@
Look at the result.
- >>> browser.open('http://localhost/site/myDocument/@@view.html')
+ >>> browser.open('http://localhost/site/myDocument/@@view')
>>> 'spam' in browser.contents
True
Changes can't be saved if the safety belt is invalid.
- >>> browser.open('http://localhost/site/myDocument/@@edit.html')
+ >>> browser.open('http://localhost/site/myDocument/@@edit')
>>> app.site.myDocument._safety_belt = '1'
@@ -61,7 +61,7 @@
Changes can't be saved if the document is locked.
- >>> browser.open('http://localhost/site/myDocument/@@edit.html')
+ >>> browser.open('http://localhost/site/myDocument/@@edit')
>>> from webdav.LockItem import LockItem
>>> lock = LockItem(uf.getUser('mgr').__of__(uf))
@@ -80,13 +80,13 @@
Structured Text will be formatted as HTML in the view.
- >>> browser.open('http://localhost/site/myDocument/@@edit.html')
+ >>> browser.open('http://localhost/site/myDocument/@@edit')
>>> browser.getControl(name='form.text_format').value == ['structured-text']
True
>>> browser.getControl('[[cmf_default][Body]]').value = '*spam and eggs*'
>>> browser.getControl('[[cmf_default][Change]]').click()
- >>> browser.open('http://localhost/site/myDocument/@@view.html')
+ >>> browser.open('http://localhost/site/myDocument/@@view')
>>> '*spam and eggs*' in browser.contents
False
>>> '<em>spam and eggs</em>' in browser.contents
@@ -113,7 +113,7 @@
The source view is only used in 'html' mode.
- >>> browser.open('http://localhost/site/myDocument/@@edit.html')
+ >>> browser.open('http://localhost/site/myDocument/@@edit')
>>> browser.getControl(name='form.text_format').value = ['html']
>>> browser.getControl('[[cmf_default][Body]]').value = '<b>spam</b>'
>>> browser.getControl('[[cmf_default][Change]]').click()
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -39,7 +39,7 @@
Use the edit form without input.
- >>> browser.open('http://localhost/site/myFavorite/@@edit.html')
+ >>> browser.open('http://localhost/site/myFavorite/@@edit')
>>> '[[cmf_default][Edit [[cmf_default][Favorite]]]]' in browser.contents
True
>>> browser.getControl('[[cmf_default][Change]]').click()
@@ -48,7 +48,7 @@
Use the edit form with valid input.
- >>> browser.open('http://localhost/site/myFavorite/@@edit.html')
+ >>> browser.open('http://localhost/site/myFavorite/@@edit')
>>> '[[cmf_default][Edit [[cmf_default][Favorite]]]]' in browser.contents
True
>>> browser.getControl(name='form.remote_url').value = 'PATH/TO/OTHER'
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -40,7 +40,7 @@
Use the edit form without input.
- >>> browser.open('http://localhost/site/myFile/@@edit.html')
+ >>> browser.open('http://localhost/site/myFile/@@edit')
>>> '[[cmf_default][Edit [[cmf_default][File]]]]' in browser.contents
True
>>> browser.getControl('[[cmf_default][Change]]').click()
@@ -49,7 +49,7 @@
Use the edit form with valid input.
- >>> browser.open('http://localhost/site/myFile/@@edit.html')
+ >>> browser.open('http://localhost/site/myFile/@@edit')
>>> '[[cmf_default][Edit [[cmf_default][File]]]]' in browser.contents
True
>>> ctrl = browser.getControl(name='form.file')
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -18,52 +18,52 @@
Open the contents view with the various options selected.
All sort options apart from position are reversible.
- >>> browser.open('http://localhost/site/@@edit.html?form.b_start=25')
+ >>> browser.open('http://localhost/site/@@edit?form.b_start=25')
>>> 'name="form.b_start" type="hidden" value="25"' in browser.contents
True
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=Type')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=Type')
>>> 'name="form.sort_key" type="hidden" value="Type"' in browser.contents
True
- >>> 'href="http://localhost/site/@@edit.html?form.sort_key=Type&form.reverse=1">' \
+ >>> 'href="http://localhost/site/@@edit?form.sort_key=Type&form.reverse=1">' \
... in browser.contents
True
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=getId')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=getId')
>>> 'name="form.sort_key" type="hidden" value="getId"' in browser.contents
True
- >>> 'href="http://localhost/site/@@edit.html?form.sort_key=getId&form.reverse=1">' \
+ >>> 'href="http://localhost/site/@@edit?form.sort_key=getId&form.reverse=1">' \
... in browser.contents
True
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=modified')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=modified')
>>> 'name="form.sort_key" type="hidden" value="modified"' in browser.contents
True
- >>> 'href="http://localhost/site/@@edit.html?form.sort_key=modified&form.reverse=1">' \
+ >>> 'href="http://localhost/site/@@edit?form.sort_key=modified&form.reverse=1">' \
... in browser.contents
True
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=position')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=position')
>>> 'name="form.sort_key" type="hidden" value="position"' in browser.contents
True
- >>> 'href="http://localhost/site/@@edit.html?form.sort_key=position&form.reverse=1">' \
+ >>> 'href="http://localhost/site/@@edit?form.sort_key=position&form.reverse=1">' \
... in browser.contents
False
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=Type&form.reverse=1')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=Type&form.reverse=1')
>>> 'name="form.reverse" type="hidden" value="1"' in browser.contents
True
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=getId&form.reverse=1')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=getId&form.reverse=1')
>>> 'name="form.reverse" type="hidden" value="1"' in browser.contents
True
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=modified&form.reverse=1')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=modified&form.reverse=1')
>>> 'name="form.reverse" type="hidden" value="1"' in browser.contents
True
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=position&form.reverse=1')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=position&form.reverse=1')
>>> 'name="form.reverse" type="hidden" value="1"' in browser.contents
True
Verify initially visible buttons:
- >>> browser.open('http://localhost/site/@@edit.html')
+ >>> browser.open('http://localhost/site/@@edit')
>>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
@@ -94,7 +94,7 @@
Now there is clipboard data and the paste button is also visible:
- >>> browser.open('http://localhost/site/@@edit.html')
+ >>> browser.open('http://localhost/site/@@edit')
>>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
@@ -124,7 +124,7 @@
Now there is more than one object and the order buttons are visible:
- >>> browser.open('http://localhost/site/@@edit.html')
+ >>> browser.open('http://localhost/site/@@edit')
>>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
@@ -150,7 +150,7 @@
>>> from Products.CMFDefault.permissions import AddPortalContent
>>> app.site.manage_permission(AddPortalContent, roles=[])
- >>> browser.open('http://localhost/site/@@edit.html')
+ >>> browser.open('http://localhost/site/@@edit')
>>> '[[cmf_default][Rename...]]' in browser.contents
False
>>> '[[cmf_default][Cut]]' in browser.contents
@@ -165,7 +165,7 @@
>>> from Products.CMFDefault.permissions import DeleteObjects
>>> app.site.manage_permission(DeleteObjects, roles=[])
- >>> browser.open('http://localhost/site/@@edit.html')
+ >>> browser.open('http://localhost/site/@@edit')
>>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
@@ -180,7 +180,7 @@
>>> from Products.CMFDefault.permissions import ViewManagementScreens
>>> app.site.manage_permission(ViewManagementScreens, roles=[])
- >>> browser.open('http://localhost/site/@@edit.html')
+ >>> browser.open('http://localhost/site/@@edit')
>>> '[[cmf_default][Rename...]]' in browser.contents
False
>>> '[[cmf_default][Cut]]' in browser.contents
@@ -195,7 +195,7 @@
Sorted by getId different buttons are visible:
- >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=getId')
+ >>> browser.open('http://localhost/site/@@edit?form.sort_key=getId')
>>> '[[cmf_default][Rename...]]' in browser.contents
True
>>> '[[cmf_default][Cut]]' in browser.contents
@@ -227,7 +227,7 @@
Select 'Members' subfolder for renaming:
- >>> browser.open('http://localhost/site/@@edit.html')
+ >>> browser.open('http://localhost/site/@@edit')
>>> browser.getControl(name='form.select_ids').value = ('Members',)
>>> browser.getControl('[[cmf_default][Rename...]]').click()
>>> '[[cmf_default][Rename Items]]' in browser.contents
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -32,7 +32,7 @@
Look at the result.
- >>> browser.open('http://localhost/site/myImage.gif/@@view.html')
+ >>> browser.open('http://localhost/site/myImage.gif/@@view')
>>> 'IMAGE DESCRIPTION' in browser.contents
True
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -39,7 +39,7 @@
Use the edit form without input.
- >>> browser.open('http://localhost/site/myLink/@@edit.html')
+ >>> browser.open('http://localhost/site/myLink/@@edit')
>>> '[[cmf_default][Edit [[cmf_default][Link]]]]' in browser.contents
True
>>> browser.getControl('[[cmf_default][Change]]').click()
@@ -48,7 +48,7 @@
Use the edit form with valid input.
- >>> browser.open('http://localhost/site/myLink/@@edit.html')
+ >>> browser.open('http://localhost/site/myLink/@@edit')
>>> '[[cmf_default][Edit [[cmf_default][Link]]]]' in browser.contents
True
>>> browser.getControl(name='form.remote_url').value = 'WWW.EXAMPLE.COM'
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -22,7 +22,7 @@
Use the edit form with valid input.
- >>> browser.open('http://localhost/site/myContent/@@properties.html')
+ >>> browser.open('http://localhost/site/myContent/@@properties')
>>> '[[cmf_default][Properties]]' in browser.contents
True
>>> browser.getControl(name='form.allow_discussion').value = ('off',)
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/TODO.rst
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/TODO.rst 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/TODO.rst 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,24 +1,24 @@
-Converting skins to views
-=========================
+Converting skins to views:
+==========================
Discussions
- [?] talkback_tree.pt (macros)
- [?] setup_talkback_tree.py
-[x] IDiscussionResponse @@view.html:
-------------------------------------
+[x] IDiscussionResponse @@view:
+-------------------------------
- [x] discussionitem_view.py -> discussion.View
- [x] aboveInThread.py -> discussion.View.aboveInThread
- [x] discussionitem_view_template.pt -> discussion.pt
-[ ] IDiscussionResponse @@edit.html:
-------------------------------------
+[ ] IDiscussionResponse @@edit:
+-------------------------------
- [ ] discussion_reply_form.py
- [ ] validateHTML.py
- [ ] discussion_reply.py
- [ ] discussion_reply_template.pt
-[ ] IDiscussionResponse @@delete.html:
---------------------------------------
+[ ] IDiscussionResponse @@delete:
+---------------------------------
- [x] discitem_delete.py
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/configure.zcml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/configure.zcml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -5,7 +5,7 @@
<browser:page
for="Products.CMFCore.interfaces.IDiscussionResponse"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="view.html"
+ name="view"
class=".discussion.View"
template="discussion.pt"
permission="zope2.View"
@@ -14,7 +14,7 @@
<browser:page
for="Products.CMFCore.interfaces.IContentish"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="discuss.html"
+ name="discuss"
class=".discussion.Discuss"
permission="cmf.ModifyPortalContent"
/>
@@ -22,7 +22,7 @@
<browser:page
for="Products.CMFCore.interfaces.IDiscussionResponse"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
- name="delete.html"
+ name="delete"
class=".discussion.Delete"
permission="cmf.ModifyPortalContent"
/>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/tests/discussion.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/tests/discussion.txt 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/tests/discussion.txt 2013-07-11 19:56:11 UTC (rev 130266)
@@ -43,7 +43,7 @@
Add a comment
- >>> browser.open("http://localhost/site/myDocument/discuss.html")
+ >>> browser.open("http://localhost/site/myDocument/@@discuss")
>>> "[[cmf_default][Reply body]]" in browser.contents
True
>>> browser.getControl(name='form.title').value = ('A reply')
@@ -63,7 +63,7 @@
Check deleting
- >>> browser.open("{0}/@@delete.html".format(browser.url))
+ >>> browser.open("{0}/@@delete".format(browser.url))
>>> 'talkback' in browser.url
False
>>> '[[cmf_default][Reply deleted.]]' in browser.contents
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="CMF BTree Folder">
- <alias from="(Default)" to="@@view.html"/>
- <alias from="folder_contents" to="@@edit.html"/>
- <alias from="index.html" to="@@view.html"/>
- <alias from="properties" to="@@properties.html"/>
- <alias from="share" to="@@share.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="(Default)" to="@@view"/>
+ <alias from="folder_contents" to="@@edit"/>
+ <alias from="index.html" to="@@view"/>
+ <alias from="properties" to=""/>
+ <alias from="share" to=""/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Discussion_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Discussion_Item.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Discussion_Item.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<object name="Discussion Item">
- <alias from="(Default)" to="@@view.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="(Default)" to="@@view"/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Document.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Document.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Document.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<object name="Document">
- <alias from="(Default)" to="@@view.html"/>
- <alias from="edit" to="@@edit.html"/>
- <alias from="gethtml" to="@@source.html"/>
- <alias from="properties" to="@@properties.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="(Default)" to="@@view"/>
+ <alias from="edit" to="@@edit"/>
+ <alias from="gethtml" to="@@source"/>
+ <alias from="properties" to=""/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Favorite.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Favorite.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Favorite.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<object name="Favorite">
- <alias from="(Default)" to="@@view.html"/>
- <alias from="edit" to="@@edit.html"/>
- <alias from="properties" to="@@properties.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="(Default)" to="@@view"/>
+ <alias from="edit" to="@@edit"/>
+ <alias from="properties" to=""/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/File.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/File.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/File.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<object name="File">
- <alias from="edit" to="@@edit.html"/>
- <alias from="properties" to="@@properties.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="edit" to="@@edit"/>
+ <alias from="properties" to=""/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<object name="Folder">
- <alias from="(Default)" to="@@view.html"/>
- <alias from="folder_contents" to="@@edit.html"/>
- <alias from="index.html" to="@@view.html"/>
- <alias from="properties" to="@@properties.html"/>
- <alias from="share" to="@@share.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="(Default)" to="@@view"/>
+ <alias from="folder_contents" to="@@edit"/>
+ <alias from="index.html" to="@@view"/>
+ <alias from="properties" to=""/>
+ <alias from="share" to=""/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Image.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Image.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Image.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<object name="Image">
- <alias from="edit" to="@@edit.html"/>
- <alias from="properties" to="@@properties.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="edit" to="@@edit"/>
+ <alias from="properties" to=""/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Link.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Link.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Link.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<object name="Link">
- <alias from="(Default)" to="@@view.html"/>
- <alias from="edit" to="@@edit.html"/>
- <alias from="properties" to="@@properties.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="(Default)" to="@@view"/>
+ <alias from="edit" to="@@edit"/>
+ <alias from="properties" to=""/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/News_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/News_Item.xml 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/News_Item.xml 2013-07-11 19:56:11 UTC (rev 130266)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<object name="News Item">
- <alias from="(Default)" to="@@view.html"/>
- <alias from="edit" to="@@edit.html"/>
- <alias from="gethtml" to="@@source.html"/>
- <alias from="properties" to="@@properties.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="(Default)" to="@@view"/>
+ <alias from="edit" to="@@edit"/>
+ <alias from="gethtml" to="@@source"/>
+ <alias from="properties" to=""/>
+ <alias from="view" to=""/>
</object>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py 2013-07-11 19:56:11 UTC (rev 130266)
@@ -470,6 +470,13 @@
'topic_edit_form': 'properties', # CMFTopic
'view.html': 'view'}
+_ALIASES = {
+ 'Event': {'(Default)': '@@view', 'edit': '@@edit',
+ 'view': ''}, # CMFCalendar
+ 'Topic': {'(Default)': '@@view', 'criteria': '',
+ 'folder_contents': '@@edit', 'index.html': '@@view',
+ 'properties': '', 'view': ''}} # CMFTopic
+
def check_type_infos(tool):
"""2.2.x to 2.3.0 upgrade step checker
"""
@@ -486,6 +493,15 @@
old_name = parts[1]
if old_name in _ACTION_URLS:
return True
+
+ ti_id = ti.getId()
+ if ti_id in _ALIASES:
+ for k, v in _ALIASES[ti_id].iteritems():
+ if ti.queryMethodID(k) != v:
+ return True
+ icon_expr = ti.getProperty('icon_expr')
+ if icon_expr == 'string:${portal_url}/topic_icon.gif':
+ return True
return False
def upgrade_type_infos(tool):
@@ -498,6 +514,7 @@
immediate_view = ti.getProperty('immediate_view')
if immediate_view in _ACTION_URLS:
ti._setPropValue('immediate_view', _ACTION_URLS[immediate_view])
+ changed = True
for ai in ti.listActions():
parts = ai.getActionExpression().rsplit('/')
@@ -519,5 +536,19 @@
ti.setMethodAliases(aliases)
changed = True
+ ti_id = ti.getId()
+ if ti_id in _ALIASES:
+ for k, v in _ALIASES[ti_id].iteritems():
+ if ti.queryMethodID(k) != v:
+ aliases = ti.getMethodAliases()
+ aliases[k] = v
+ ti.setMethodAliases(aliases)
+ changed = True
+ icon_expr = ti.getProperty('icon_expr')
+ if icon_expr == 'string:${portal_url}/topic_icon.gif':
+ icon_expr = 'string:${portal_url}/++resource++topic_icon.gif'
+ ti._updateProperty('icon_expr', icon_expr)
+ changed = True
+
if changed:
logger.info("TypeInfo '%s' changed." % ti.getId())
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23views.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23views.py 2013-07-06 08:56:42 UTC (rev 130265)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23views.py 2013-07-11 19:56:11 UTC (rev 130266)
@@ -64,13 +64,23 @@
logger.info("Updated '{0}' action.".format(k))
_ALIASES = {
- 'CMF BTree Folder': {'share': '@@share.html'},
- 'Discussion Item': {'(Default)': '@@view.html', 'view': '@@view.html'},
- 'Document': {'gethtml': '@@source.html'},
- 'File': {'view': '@@view.html'},
- 'Folder': {'share': '@@share.html'},
- 'Image': {'view': '@@view.html'},
- 'News Item': {'gethtml': '@@source.html'}}
+ 'CMF BTree Folder': {'(Default)': '@@view', 'folder_contents': '@@edit',
+ 'index.html': '@@view', 'properties': '', 'share': '',
+ 'view': ''},
+ 'Discussion Item': {'(Default)': '@@view', 'view': ''},
+ 'Document': {'(Default)': '@@view', 'edit': '@@edit',
+ 'gethtml': '@@source', 'properties': '', 'view': ''},
+ 'Favorite': {'(Default)': '@@view', 'edit': '@@edit', 'properties': '',
+ 'view': ''},
+ 'File': { 'edit': '@@edit', 'properties': '', 'view': ''},
+ 'Folder': {'(Default)': '@@view', 'folder_contents': '@@edit',
+ 'index.html': '@@view', 'properties': '', 'share': '',
+ 'view': ''},
+ 'Image': { 'edit': '@@edit', 'properties': '', 'view': ''},
+ 'Link': {'(Default)': '@@view', 'edit': '@@edit', 'properties': '',
+ 'view': ''},
+ 'News Item': {'(Default)': '@@view', 'edit': '@@edit',
+ 'gethtml': '@@source', 'properties': '', 'view': ''}}
def check_type_aliases(tool):
"""2.2.x to 2.3.0 upgrade step checker
More information about the checkins
mailing list