diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/download.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/download.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/download.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/download.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/file_upload.xml similarity index 96% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/file_upload.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/file_upload.xml index 8f806b52e5942bb02db23beacf894d9d9f040ab1..1f4543f98ed654394e09f6e6e32dc39cc1ce54be 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/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}/DMS_FileUploadDialog</string> </value> + <value> <string>string:${object_url}/File_UploadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/history.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/history.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/history.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/history.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_all_related.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_all_related.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_all_related.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_all_related.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_predecessor.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_predecessor.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_predecessor.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_predecessor.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_similar.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_similar.xml similarity index 97% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_similar.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_similar.xml index 9c43577d638232bcf76647985cc692b602d93de6..65b4a442f8864b9a12fef40773f4584ddcde9d98 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_similar.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_similar.xml @@ -58,7 +58,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Similar documents</string> </value> + <value> <string>SImilar Documents</string> </value> </item> <item> <key> <string>visible</string> </key> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_similarity_cloud.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_similarity_cloud.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_similarity_cloud.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_similarity_cloud.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_successor.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_successor.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_successor.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_successor.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_wiki_predecessor.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_wiki_predecessor.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_wiki_predecessor.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_wiki_predecessor.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/local_permission.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/local_permission.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/local_permission.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/local_permission.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/metadata.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/metadata.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/metadata.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/metadata.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/related_document.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/related_document.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/related_document.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/related_document.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/view.xml similarity index 96% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/view.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/File/view.xml index 2b53af46e43b8026663132178e98642e8141819e..f0fbf051d8400583f6b04386014c025ecf489a31 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/view.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/DMSFile_view</string> </value> + <value> <string>string:${object_url}/File_view</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/export.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/export.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/export.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/export.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml similarity index 96% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/file_upload.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml index 5aa9fb252ed61466aaa659e3b1325d38ee80a306..6fdd4f778801553f42a324289f4d9833b5acb36d 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/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}/DMS_FileUploadDialog</string> </value> + <value> <string>string:${object_url}/File_UploadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/fullsize_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/fullsize_view.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/fullsize_view.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/fullsize_view.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/history.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/history.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/history.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/history.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_all_related.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_all_related.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_all_related.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_all_related.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_predecessor.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_predecessor.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_predecessor.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_predecessor.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_similar.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similar.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/jump_to_similar.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similar.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_similarity_cloud.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similarity_cloud.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_similarity_cloud.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similarity_cloud.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_successor.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_successor.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_successor.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_successor.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_wiki_predecessor.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_wiki_predecessor.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_wiki_predecessor.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_wiki_predecessor.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/local_permission.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/local_permission.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/local_permission.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/local_permission.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/metadata.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/metadata.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/metadata.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/metadata.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/print.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/print.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/print.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/print.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/related_document.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/related_document.xml similarity index 100% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/related_document.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/related_document.xml diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml similarity index 96% rename from bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/view.xml rename to bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml index 1c7294373fdfb3d656cf852908ea4867fa0f8a9f..f53e1817de2831e7155bbcedd2baef8e1b602303 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/DMSFile_view</string> </value> + <value> <string>string:${object_url}/File_view</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/file_upload.xml index 8f806b52e5942bb02db23beacf894d9d9f040ab1..1f4543f98ed654394e09f6e6e32dc39cc1ce54be 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/file_upload.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/file_upload.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/DMS_FileUploadDialog</string> </value> + <value> <string>string:${object_url}/File_UploadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml index 2b53af46e43b8026663132178e98642e8141819e..f0fbf051d8400583f6b04386014c025ecf489a31 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/DMSFile_view</string> </value> + <value> <string>string:${object_url}/File_view</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/file_upload.xml index 8f806b52e5942bb02db23beacf894d9d9f040ab1..1f4543f98ed654394e09f6e6e32dc39cc1ce54be 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/file_upload.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/file_upload.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/DMS_FileUploadDialog</string> </value> + <value> <string>string:${object_url}/File_UploadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/file_upload.xml index 8f806b52e5942bb02db23beacf894d9d9f040ab1..1f4543f98ed654394e09f6e6e32dc39cc1ce54be 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/file_upload.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/file_upload.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/DMS_FileUploadDialog</string> </value> + <value> <string>string:${object_url}/File_UploadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/file_upload.xml index 8f806b52e5942bb02db23beacf894d9d9f040ab1..1f4543f98ed654394e09f6e6e32dc39cc1ce54be 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/file_upload.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/file_upload.xml @@ -81,7 +81,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/DMS_FileUploadDialog</string> </value> + <value> <string>string:${object_url}/File_UploadDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 719dc16a3b227043af5bb049977c986c66240ac5..2cd9f25d6ef798b0f210b0e1c03531cf2327264b 100644 --- a/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -1,16 +1,13 @@ <allowed_content_type_list> - <portal_type id="DMS File"> - <item>Role Definition</item> - </portal_type> <portal_type id="Document Module"> <item>Text</item> <item>External Library File</item> <item>External Web Page</item> <item>Spreadsheet</item> <item>Presentation</item> - <item>DMS File</item> <item>PDF</item> <item>Drawing</item> + <item>File</item> </portal_type> <portal_type id="Drawing"> <item>Role Definition</item> @@ -21,12 +18,12 @@ <portal_type id="File"> <item>Role Definition</item> </portal_type> + <portal_type id="Image"> + <item>Role Definition</item> + </portal_type> <portal_type id="Image Module"> <item>Image</item> </portal_type> - <portal_type id="ImageDocument"> - <item>Role Definition</item> - </portal_type> <portal_type id="PDF"> <item>Role Definition</item> </portal_type> diff --git a/bt5/erp5_dms/PortalTypeRolesTemplateItem/Graphic.xml b/bt5/erp5_dms/PortalTypeRolesTemplateItem/Drawing.xml similarity index 100% rename from bt5/erp5_dms/PortalTypeRolesTemplateItem/Graphic.xml rename to bt5/erp5_dms/PortalTypeRolesTemplateItem/Drawing.xml diff --git a/bt5/erp5_dms/PortalTypeRolesTemplateItem/DMS%20File.xml b/bt5/erp5_dms/PortalTypeRolesTemplateItem/File.xml similarity index 100% rename from bt5/erp5_dms/PortalTypeRolesTemplateItem/DMS%20File.xml rename to bt5/erp5_dms/PortalTypeRolesTemplateItem/File.xml diff --git a/bt5/erp5_dms/PortalTypeRolesTemplateItem/ImageDocument.xml b/bt5/erp5_dms/PortalTypeRolesTemplateItem/Image.xml similarity index 100% rename from bt5/erp5_dms/PortalTypeRolesTemplateItem/ImageDocument.xml rename to bt5/erp5_dms/PortalTypeRolesTemplateItem/Image.xml diff --git a/bt5/erp5_dms/PortalTypeRolesTemplateItem/PdfDocument.xml b/bt5/erp5_dms/PortalTypeRolesTemplateItem/PDF.xml similarity index 100% rename from bt5/erp5_dms/PortalTypeRolesTemplateItem/PdfDocument.xml rename to bt5/erp5_dms/PortalTypeRolesTemplateItem/PDF.xml diff --git a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/DMS%20File.xml b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/DMS%20File.xml deleted file mode 100644 index c111757e4fdb6077aeb0b33f464b15fd66009156..0000000000000000000000000000000000000000 --- a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/DMS%20File.xml +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Type.ERP5Type</string> - <string>ERP5TypeInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_actions</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>_aliases</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>_roles</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>acquire_local_roles</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>allowed_content_types</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>base_category_list</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>content_icon</string> </key> - <value> <string>document.gif</string> </value> - </item> - <item> - <key> <string>content_meta_type</string> </key> - <value> <string>ERP5 DMS File</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string> Special base class, different from File only in that it can contain things \n - (like Role Definition, for example)\n - Could (perhaps should) be a parent class for OOoDocument\n - Should probably be located somewhere else\n -</string> </value> - </item> - <item> - <key> <string>factory</string> </key> - <value> <string>addDMSFile</string> </value> - </item> - <item> - <key> <string>filter_content_types</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>group_list</string> </key> - <value> - <tuple> - <string>dms_document</string> - </tuple> - </value> - </item> - <item> - <key> <string>hidden_content_type_list</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>DMS File</string> </value> - </item> - <item> - <key> <string>init_script</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>property_sheet_list</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/ImageDocument.xml b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Image.xml similarity index 93% rename from bt5/erp5_dms/PortalTypeTemplateItem/portal_types/ImageDocument.xml rename to bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Image.xml index 763b0acd2345526736f5b8e2ab6c82fe05c2768f..c24e0db034a9396cf603c5c0e6150531490f2771 100644 --- a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/ImageDocument.xml +++ b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Image.xml @@ -58,7 +58,7 @@ </item> <item> <key> <string>content_meta_type</string> </key> - <value> <string>ERP5 Image Document</string> </value> + <value> <string>ERP5 Image</string> </value> </item> <item> <key> <string>description</string> </key> @@ -66,7 +66,7 @@ </item> <item> <key> <string>factory</string> </key> - <value> <string>addImageDocument</string> </value> + <value> <string>addImage</string> </value> </item> <item> <key> <string>filter_content_types</string> </key> @@ -88,7 +88,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>ImageDocument</string> </value> + <value> <string>Image</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml index 18beb791aec7927bbc33561c3f56cefbbc331b7c..dfb1c73ae142c546eb9c67e7bf15696cc3216a51 100644 --- a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml +++ b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml @@ -58,7 +58,7 @@ </item> <item> <key> <string>content_meta_type</string> </key> - <value> <string>ERP5 Pdf Document</string> </value> + <value> <string>ERP5 PDF</string> </value> </item> <item> <key> <string>description</string> </key> @@ -67,7 +67,7 @@ </item> <item> <key> <string>factory</string> </key> - <value> <string>addPdfDocument</string> </value> + <value> <string>addPDF</string> </value> </item> <item> <key> <string>filter_content_types</string> </key> diff --git a/bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 3e0d0495225c3f811475607177596021b6669125..943fb00c967f6942dd6d718d1db4f58d8d4389bd 100644 --- a/bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -1,8 +1,4 @@ <workflow_chain> - <chain> - <type>DMS File</type> - <workflow>document_publication_workflow, edit_workflow, local_permission_interaction_workflow, dms_file_interaction_workflow</workflow> - </chain> <chain> <type>Drawing</type> <workflow>local_permission_interaction_workflow, edit_workflow, dms_file_interaction_workflow, document_publication_workflow, ooo_interaction_workflow</workflow> @@ -13,11 +9,15 @@ </chain> <chain> <type>External Web Page</type> - <workflow>edit_workflow, external_document_interaction_workflow, external_document_publication_workflow</workflow> + <workflow>edit_workflow, external_document_publication_workflow, external_document_interaction_workflow</workflow> + </chain> + <chain> + <type>File</type> + <workflow>dms_file_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow</workflow> </chain> <chain> - <type>ImageDocument</type> - <workflow>dms_file_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow, edit_workflow</workflow> + <type>Image</type> + <workflow>edit_workflow, dms_file_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow</workflow> </chain> <chain> <type>PDF</type> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSDocument_uploadFile.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSDocument_uploadFile.xml index c95e33c8c447ee2000528a9f2ccd01834661cbcb..b9985517103bff971a6edf90dfa62b8418f79929 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSDocument_uploadFile.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSDocument_uploadFile.xml @@ -78,8 +78,8 @@ fname=f.filename\n # we check for appropriate file type (by extension, using content_type_registry)\n # we accept or suggest appropriate portal type\n ctype=context.content_type_registry.findTypeName(fname,None,None)\n -if ctype is None and typ!=\'DMS File\':\n - raise Exception(\'This file should be uploaded into DMS File\')\n +if ctype is None and typ!=\'File\':\n + raise Exception(\'This file should be uploaded into File\')\n if ctype is not None and ctype!=typ:\n raise Exception(\'This file should be uploaded into \'+ctype)\n \n diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getBaseCategoryList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getBaseCategoryList.xml index fdd772983409375a45fe07b9e53b0115fc210134..2083ca44f796aa8041ae874b59e2c035b0a7fdc6 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getBaseCategoryList.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getBaseCategoryList.xml @@ -71,9 +71,9 @@ <value> <string># we return only those base categories to which all DMS-related portal_types belong\n # you need to define the list of DMS types here\n # and to add a base category add it in DMSFile property sheets\n -# or manuall for all these portal_types\n +# or manually for all these portal_types\n \n -types=(\'Spreadsheet\',\'Text\',\'Presentation\',\'Graphic\',\'DMS File\',\'PDF\')\n +types=context.getPortalDocumentTypeList()\n nrtypes=len(types)\n basecatdict={}\n for t in types:\n @@ -125,15 +125,15 @@ return basecatlist\n <key> <string>co_varnames</string> </key> <value> <tuple> + <string>_getattr_</string> + <string>context</string> <string>types</string> <string>len</string> <string>nrtypes</string> <string>basecatdict</string> <string>_getiter_</string> <string>t</string> - <string>_getattr_</string> <string>_getitem_</string> - <string>context</string> <string>bases</string> <string>b</string> <string>_write_</string> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_UploadDialog.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_UploadDialog.xml new file mode 100644 index 0000000000000000000000000000000000000000..fdd926f644b0c856ffb404c9022145d40451794d --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_UploadDialog.xml @@ -0,0 +1,150 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Form.Form</string> + <string>ERP5Form</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary/> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_objects</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>action</string> </key> + <value> <string>DMSDocument_uploadFile</string> </value> + </item> + <item> + <key> <string>encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>enctype</string> </key> + <value> <string>multipart/form-data</string> </value> + </item> + <item> + <key> <string>group_list</string> </key> + <value> + <list> + <string>left</string> + <string>right</string> + <string>center</string> + <string>bottom</string> + <string>hidden</string> + </list> + </value> + </item> + <item> + <key> <string>groups</string> </key> + <value> + <dictionary> + <item> + <key> <string>bottom</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>center</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>left</string> </key> + <value> + <list> + <string>my_file</string> + </list> + </value> + </item> + <item> + <key> <string>right</string> </key> + <value> + <list/> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>File_UploadDialog</string> </value> + </item> + <item> + <key> <string>method</string> </key> + <value> <string>POST</string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string>DMS_FileUploadDialog</string> </value> + </item> + <item> + <key> <string>pt</string> </key> + <value> <string>form_dialog</string> </value> + </item> + <item> + <key> <string>row_length</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>stored_encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Upload file</string> </value> + </item> + <item> + <key> <string>unicode_mode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>update_action</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_FileUploadDialog/my_file.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_UploadDialog/my_file.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_FileUploadDialog/my_file.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_UploadDialog/my_file.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view.xml new file mode 100644 index 0000000000000000000000000000000000000000..90229148fc158df5828171abb2e4a2f0da7f7dfd --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view.xml @@ -0,0 +1,173 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Form.Form</string> + <string>ERP5Form</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary/> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_objects</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>action</string> </key> + <value> <string>Base_edit</string> </value> + </item> + <item> + <key> <string>encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>enctype</string> </key> + <value> <string>multipart/form-data</string> </value> + </item> + <item> + <key> <string>group_list</string> </key> + <value> + <list> + <string>left</string> + <string>right</string> + <string>center</string> + <string>content bottom</string> + <string>hidden</string> + </list> + </value> + </item> + <item> + <key> <string>groups</string> </key> + <value> + <dictionary> + <item> + <key> <string>center</string> </key> + <value> + <list> + <string>my_source_project_title</string> + <string>my_classification</string> + <string>my_dms_category_list</string> + </list> + </value> + </item> + <item> + <key> <string>content bottom</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>left</string> </key> + <value> + <list> + <string>my_translated_portal_type</string> + <string>my_title</string> + <string>my_reference</string> + <string>my_version</string> + <string>my_language</string> + <string>my_short_title</string> + <string>my_int_index</string> + <string>my_source_reference</string> + <string>my_translated_simulation_state_title</string> + </list> + </value> + </item> + <item> + <key> <string>right</string> </key> + <value> + <list> + <string>image_view</string> + <string>my_description</string> + <string>my_subject_list</string> + <string>my_contributor_title_list</string> + </list> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>File_view</string> </value> + </item> + <item> + <key> <string>method</string> </key> + <value> <string>POST</string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string>Base_viewClassification</string> </value> + </item> + <item> + <key> <string>pt</string> </key> + <value> <string>form_view</string> </value> + </item> + <item> + <key> <string>row_length</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>stored_encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Document</string> </value> + </item> + <item> + <key> <string>unicode_mode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>update_action</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/image_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/image_view.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/image_view.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/image_view.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_classification.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_classification.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_classification.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_classification.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_contributor_title_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_contributor_title_list.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_contributor_title_list.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_contributor_title_list.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_description.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_description.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_description.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_description.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_dms_category_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_dms_category_list.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_dms_category_list.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_dms_category_list.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_int_index.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_int_index.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_int_index.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_int_index.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_language.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_language.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_language.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_language.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_reference.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_reference.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_reference.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_reference.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_short_title.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_short_title.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_short_title.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_short_title.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_source_project_title.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_source_project_title.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_source_project_title.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_source_project_title.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_source_reference.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_source_reference.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_source_reference.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_source_reference.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_subject_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_subject_list.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_subject_list.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_subject_list.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_title.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_title.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_title.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_title.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_translated_portal_type.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_translated_portal_type.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_translated_portal_type.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_translated_portal_type.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_translated_simulation_state_title.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_translated_simulation_state_title.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_translated_simulation_state_title.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_translated_simulation_state_title.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_version.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_version.xml similarity index 100% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSFile_view/my_version.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_version.xml diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 5f5d9b11ac62bcf4b8955b4ab0ff1e2216ff4825..cadbe928f85634ae380371c3266c8dad6eefd5e7 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -375 \ No newline at end of file +378 \ No newline at end of file diff --git a/bt5/erp5_dms/bt/template_action_path_list b/bt5/erp5_dms/bt/template_action_path_list index 1e49dc23e4816dbf6d39efebffd7c11f98227e66..012267f0613b7d03cd60e3e619ee55d9ceb6c42d 100644 --- a/bt5/erp5_dms/bt/template_action_path_list +++ b/bt5/erp5_dms/bt/template_action_path_list @@ -1,17 +1,4 @@ Book | view -DMS File | download -DMS File | file_upload -DMS File | history -DMS File | jump_to_all_related -DMS File | jump_to_predecessor -DMS File | jump_to_similar -DMS File | jump_to_similarity_cloud -DMS File | jump_to_successor -DMS File | jump_to_wiki_predecessor -DMS File | local_permission -DMS File | metadata -DMS File | related_document -DMS File | view Document Module | advanced_search Document Module | list_ui Document Module | sort_on @@ -48,24 +35,37 @@ External Web Page | history External Web Page | metadata External Web Page | spider External Web Page | view +File | download +File | file_upload +File | history +File | jump_to_all_related +File | jump_to_predecessor +File | jump_to_similar +File | jump_to_similarity_cloud +File | jump_to_successor +File | jump_to_wiki_predecessor +File | local_permission +File | metadata +File | related_document +File | view Image Module | list_ui Image Module | sort_on Image Module | view -ImageDocument | export -ImageDocument | file_upload -ImageDocument | fullsize_view -ImageDocument | history -ImageDocument | jump_to_all_related -ImageDocument | jump_to_predecessor -ImageDocument | jump_to_similar -ImageDocument | jump_to_similarity_cloud -ImageDocument | jump_to_successor -ImageDocument | jump_to_wiki_predecessor -ImageDocument | local_permission -ImageDocument | metadata -ImageDocument | print -ImageDocument | related_document -ImageDocument | view +Image | export +Image | file_upload +Image | fullsize_view +Image | history +Image | jump_to_all_related +Image | jump_to_predecessor +Image | jump_to_similar +Image | jump_to_similarity_cloud +Image | jump_to_successor +Image | jump_to_wiki_predecessor +Image | local_permission +Image | metadata +Image | print +Image | related_document +Image | view PDF | download PDF | file_upload PDF | history diff --git a/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list index b756c0828f72fa5502818c6b6e35ac42f1797123..c8cfac449212c7846f660e4691657015da5fbf21 100644 --- a/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list @@ -1,8 +1,7 @@ -DMS File | Role Definition -Document Module | DMS File Document Module | Drawing Document Module | External Library File Document Module | External Web Page +Document Module | File Document Module | PDF Document Module | Presentation Document Module | Spreadsheet @@ -10,8 +9,9 @@ Document Module | Text Drawing | Role Definition External Library File | Book File | Role Definition +File | Role Definition Image Module | Image -ImageDocument | Role Definition +Image | Role Definition PDF | Role Definition Presentation | Role Definition Spreadsheet | Role Definition diff --git a/bt5/erp5_dms/bt/template_portal_type_id_list b/bt5/erp5_dms/bt/template_portal_type_id_list index 4ba31d5e4ff8cd68041efb56d733864e6c4b85ec..644d1ae2d341634a7b4496b0875dbde9bda3a64a 100644 --- a/bt5/erp5_dms/bt/template_portal_type_id_list +++ b/bt5/erp5_dms/bt/template_portal_type_id_list @@ -1,12 +1,11 @@ Book -DMS File Document Module Drawing External Library File External Source Module External Web Page +Image Image Module -ImageDocument PDF Presentation Role Definition diff --git a/bt5/erp5_dms/bt/template_portal_type_roles_list b/bt5/erp5_dms/bt/template_portal_type_roles_list index 9444f6e7df6d5518016b3f40428aa2a2eb98d6a3..df2350b4588487a91d4a358485026d86317be409 100644 --- a/bt5/erp5_dms/bt/template_portal_type_roles_list +++ b/bt5/erp5_dms/bt/template_portal_type_roles_list @@ -1,9 +1,9 @@ -DMS File +Drawing External Library File External Web Page -Graphic -ImageDocument -PdfDocument +File +Image +PDF Presentation Spreadsheet Text \ No newline at end of file diff --git a/bt5/erp5_dms/bt/template_portal_type_workflow_chain_list b/bt5/erp5_dms/bt/template_portal_type_workflow_chain_list index d1de466d191eaf0ac1afde452f6e92e5da24a49a..dcd5bc44ba0b74c4596f3ee5866235ca17fc20af 100644 --- a/bt5/erp5_dms/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_dms/bt/template_portal_type_workflow_chain_list @@ -1,7 +1,3 @@ -DMS File | dms_file_interaction_workflow -DMS File | document_publication_workflow -DMS File | edit_workflow -DMS File | local_permission_interaction_workflow Drawing | dms_file_interaction_workflow Drawing | document_publication_workflow Drawing | edit_workflow @@ -13,10 +9,14 @@ External Library File | external_document_publication_workflow External Web Page | edit_workflow External Web Page | external_document_interaction_workflow External Web Page | external_document_publication_workflow -ImageDocument | dms_file_interaction_workflow -ImageDocument | document_publication_workflow -ImageDocument | edit_workflow -ImageDocument | local_permission_interaction_workflow +File | dms_file_interaction_workflow +File | document_publication_workflow +File | edit_workflow +File | local_permission_interaction_workflow +Image | dms_file_interaction_workflow +Image | document_publication_workflow +Image | edit_workflow +Image | local_permission_interaction_workflow PDF | dms_file_interaction_workflow PDF | document_publication_workflow PDF | edit_workflow