Skip to content

erp5
erp5
Commit 861c9c61 authored by Bartek Górny's avatar Bartek Górny
Browse files
Options

types merged - DMS properties and methods added to generic types (File,... 

types merged - DMS properties and methods added to generic types (File, Image); adjusted all the other things accordingly; plus some naming changes to get a bit closer to convention.
!!! changes have been made to ERP5.Document classes, they are not in svn yet !!!

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11645 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 887ab27f
Hide whitespace changes
Inline Side-by-side
Showing with 400 additions and 195 deletions
bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/file_upload.xml → bt5/erp5_dms/ActionTemplateItem/portal_types/File/file_upload.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/jump_to_similar.xml → bt5/erp5_dms/ActionTemplateItem/portal_types/File/jump_to_similar.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/DMS%20File/view.xml → bt5/erp5_dms/ActionTemplateItem/portal_types/File/view.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/file_upload.xml → bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/ImageDocument/view.xml → bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/file_upload.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/file_upload.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/file_upload.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/Text/file_upload.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ 861c9c61
<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>
......
bt5/erp5_dms/PortalTypeTemplateItem/portal_types/DMS%20File.xml deleted 100644 → 0
View file @ 887ab27f
<?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>
bt5/erp5_dms/PortalTypeTemplateItem/portal_types/ImageDocument.xml → bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Image.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ 861c9c61
<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>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMSDocument_uploadFile.xml
View file @ 861c9c61
......@@ -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
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getBaseCategoryList.xml
View file @ 861c9c61
......@@ -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>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_UploadDialog.xml 0 → 100644
View file @ 861c9c61
<?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>
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view.xml 0 → 100644
View file @ 861c9c61
<?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>
bt5/erp5_dms/bt/revision
View file @ 861c9c61
375
\ No newline at end of file
378
\ No newline at end of file
bt5/erp5_dms/bt/template_action_path_list
View file @ 861c9c61
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
......
bt5/erp5_dms/bt/template_portal_type_allowed_content_type_list
View file @ 861c9c61
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
......
bt5/erp5_dms/bt/template_portal_type_id_list
View file @ 861c9c61
Book
DMS File
Document Module
Drawing
External Library File
External Source Module
External Web Page
Image
Image Module
ImageDocument
PDF
Presentation
Role Definition
......
bt5/erp5_dms/bt/template_portal_type_roles_list
View file @ 861c9c61
DMS File
Drawing
External Library File
External Web Page
Graphic
ImageDocument
PdfDocument
File
Image
PDF
Presentation
Spreadsheet
Text
\ No newline at end of file
bt5/erp5_dms/bt/template_portal_type_workflow_chain_list
View file @ 861c9c61
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
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7