Commit 8d4c5605 authored by Nicolas Dumazet's avatar Nicolas Dumazet

Revert my changes on context box buttons.

They were untested, and inducing performance loss.
31664 was also removing the possibility to add same-type object in the container
when in non-list mode.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31697 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4e755e1a
...@@ -153,13 +153,9 @@ ...@@ -153,13 +153,9 @@
ui_actions actions/object_ui | nothing;\n ui_actions actions/object_ui | nothing;\n
print_actions actions/object_print | nothing;\n print_actions actions/object_print | nothing;\n
list_mode list_mode | nothing;\n list_mode list_mode | nothing;\n
can_modify_portal_content python: portal.portal_membership.checkPermission(\'Modify portal content\', here);\n can_modify_portal_content python: portal.portal_membership.checkPermission(\'Modify portal content\', here)">\n
can_delete_objects python: portal.portal_membership.checkPermission(\'Delete objects\', here);\n
can_copy_or_move python: portal.portal_membership.checkPermission(\'Copy Or Move\', here);\n
can_add_object_here python: len(here.getVisibleAllowedContentTypeList()) > 0;">\n
<span class="separator"><!--separator--></span>\n <span class="separator"><!--separator--></span>\n
<tal:block tal:condition="list_mode">\n <tal:block tal:condition="list_mode">\n
<tal:block tal:condition="can_copy_or_move">\n
<button class="cut" type="submit" name="Folder_cut:method" title="Cut"\n <button class="cut" type="submit" name="Folder_cut:method" title="Cut"\n
i18n:attributes="title" i18n:domain="ui"\n i18n:attributes="title" i18n:domain="ui"\n
tal:condition="can_modify_portal_content">\n tal:condition="can_modify_portal_content">\n
...@@ -171,7 +167,6 @@ ...@@ -171,7 +167,6 @@
<span class="image"></span>\n <span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">Copy</span>\n <span class="description" i18n:translate="" i18n:domain="ui">Copy</span>\n
</button>\n </button>\n
</tal:block>\n
<button class="paste" type="submit" name="Folder_paste:method" title="Paste"\n <button class="paste" type="submit" name="Folder_paste:method" title="Paste"\n
i18n:attributes="title" i18n:domain="ui">\n i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n <span class="image"></span>\n
...@@ -184,9 +179,8 @@ ...@@ -184,9 +179,8 @@
<span class="image"></span>\n <span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">Print</span>\n <span class="description" i18n:translate="" i18n:domain="ui">Print</span>\n
</button>\n </button>\n
<button tal:condition="python: list_mode and can_add_object_here"\n <button class="new" type="submit" title="New"\n
tal:attributes="name python: list_mode and \'Folder_create:method\' or \'Base_createNewDocument:method\'"\n tal:attributes="name python: list_mode and \'Folder_create:method\' or \'Base_createNewDocument:method\'"\n
class="new" type="submit" title="New"\n
i18n:attributes="title" i18n:domain="ui">\n i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n <span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">New</span>\n <span class="description" i18n:translate="" i18n:domain="ui">New</span>\n
...@@ -198,8 +192,7 @@ ...@@ -198,8 +192,7 @@
<span class="image"></span>\n <span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">Clone</span>\n <span class="description" i18n:translate="" i18n:domain="ui">Clone</span>\n
</button>\n </button>\n
<button tal:condition="python: list_mode and can_delete_objects" class="delete" type="submit" \n <button tal:condition="list_mode" class="delete" type="submit" name="Folder_deleteObjectList:method" title="Delete"\n
name="Folder_deleteObjectList:method" title="Delete"\n
i18n:attributes="title" i18n:domain="ui">\n i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n <span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">Delete</span>\n <span class="description" i18n:translate="" i18n:domain="ui">Delete</span>\n
......
2010-01-07 Nicolas Dumazet
* Dont show a New button if there are no Visible Allowed Content Types
* Do not show Cut/Paste button if no "Copy or Move" permission
* Do not show Delete button if no "Delete objects" permission
2009-12-11 Kazuhiko 2009-12-11 Kazuhiko
* update FCKeditor to 2.6.5. * update FCKeditor to 2.6.5.
......
867 868
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment