diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/File/download.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/download.xml index 9d52b9c7378f2b42647860f372cea34dbde0171f..d28bf5dfbb71970f60f1b867253475d22cac5d5a 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/File/download.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/download.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/OOoDocument_downloadDialog</string> </value> + <value> <string>string:${object_url}/Document_viewDownloadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/File/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/file_upload.xml index 1f4543f98ed654394e09f6e6e32dc39cc1ce54be..87969c175a6c5ff0cb575fc1f7eb49092f4029c2 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/File/file_upload.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/file_upload.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/File_UploadDialog</string> </value> + <value> <string>string:${object_url}/File_viewUploadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/export.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/export.xml index c7f8c2917968708ed3af88a505d0f6dd0721b1dc..a6348969b2033db766272464f044ce4b42fe4871 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/export.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/export.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/ImageDocument_viewTargetFileDialog</string> </value> + <value> <string>string:${object_url}/Image_viewConvertDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml index 6fdd4f778801553f42a324289f4d9833b5acb36d..2418c236d586e51457123c72ee9703dd20c479dd 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/File_UploadDialog</string> </value> + <value> <string>string:${object_url}/File_viewUploadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/print.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/print.xml index ac173a595d9957d1e2b769761c8c9ac2b5144515..6f7b32a5e4da1e062973c6fe88f164133fa08bda 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/print.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/print.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/ImageDocument_print</string> </value> + <value> <string>string:${object_url}/Image_print</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/download.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/download.xml index 5cad8c2fde17bc707e45fa5528e360d218a2349e..719f903b40afdf6f5389f69b85e1db3c84750770 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/download.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/download.xml @@ -83,7 +83,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/OOoDocument_viewDownloadDialog</string> </value> + <value> <string>string:${object_url}/Document_viewDownloadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromUser.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromUserLogin.xml similarity index 98% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromUser.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromUserLogin.xml index f5a38e6541beaa7b53e52f6eaa91b6827e08f503..f60b053820a4c4363d81044afc5edfe675f5ebb7 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromUser.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPropertyDictFromUserLogin.xml @@ -141,7 +141,7 @@ return {}\n </item> <item> <key> <string>id</string> </key> - <value> <string>Document_getPropertyDictFromUser</string> </value> + <value> <string>Document_getPropertyDictFromUserLogin</string> </value> </item> <item> <key> <string>warnings</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewDownloadDialog.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewDownloadDialog.xml similarity index 97% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewDownloadDialog.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewDownloadDialog.xml index 4174d7a7ef22cd57dce17329a544b95ae1a97f41..088437dc23973ae9e005975bb67c5045cc6cccfc 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_viewDownloadDialog.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewDownloadDialog.xml @@ -86,7 +86,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>OOoDocument_viewDownloadDialog</string> </value> + <value> <string>Document_viewDownloadDialog</string> </value> </item> <item> <key> <string>method</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/image_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/image_view.xml index 047b28cad928892e4432aeb634e374eeb9acbc23..e329643d5ee43edf13f140ea3205bd2b5abdee52 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/image_view.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/image_view.xml @@ -336,7 +336,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.getPortalType()==\'ImageDocument\'</string> </value> + <value> <string>python: here.getPortalType()==\'Image\'</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_dms_category_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_dms_category_list.xml index 33db4974dbe95394476081fc68a756761279691d..ebc568edea9a7953ee85d74cca755b32f7cbd91f 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_dms_category_list.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_dms_category_list.xml @@ -87,7 +87,7 @@ </item> <item> <key> <string>form_id</string> </key> - <value> <string>DMS_library</string> </value> + <value> <string>Document_library</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ImageModule_viewImageList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ImageModule_viewImageList.xml index 4aabe68b7bafdab37f3e55ee1a8eccb692d73525..902d5b4580fd07b81c19bbd81c8d976f533072ee 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ImageModule_viewImageList.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ImageModule_viewImageList.xml @@ -75,7 +75,9 @@ <item> <key> <string>bottom</string> </key> <value> - <list/> + <list> + <string>listbox</string> + </list> </value> </item> <item> @@ -87,9 +89,7 @@ <item> <key> <string>left</string> </key> <value> - <list> - <string>listbox</string> - </list> + <list/> </value> </item> <item> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 8f6e44195d544b665eb2312151c731f247cc9f6e..3b7560b75588f49d996dbc79ff93060f7d6492b0 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -443 \ No newline at end of file +445 \ No newline at end of file