From cfbbe04f54568f26efa9b2c3a8cef21a6254f1c0 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Thu, 29 Apr 2010 15:53:37 +0000 Subject: [PATCH] Update XML only git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34863 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../document_update_content_alarm.xml | 24 ++---------- .../allowed_content_types.xml | 38 +++++++++---------- .../base_category_list.xml | 4 +- .../hidden_content_type_list.xml | 10 ++--- .../workflow_chain_type.xml | 18 ++++----- bt5/erp5_dms/bt/revision | 2 +- 6 files changed, 39 insertions(+), 57 deletions(-) diff --git a/bt5/erp5_dms/PathTemplateItem/portal_alarms/document_update_content_alarm.xml b/bt5/erp5_dms/PathTemplateItem/portal_alarms/document_update_content_alarm.xml index 880d90629d..83a232400a 100644 --- a/bt5/erp5_dms/PathTemplateItem/portal_alarms/document_update_content_alarm.xml +++ b/bt5/erp5_dms/PathTemplateItem/portal_alarms/document_update_content_alarm.xml @@ -155,25 +155,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -181,13 +169,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 833ea125ec..0b6ab93a02 100644 --- a/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_dms/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -1,30 +1,30 @@ <allowed_content_type_list> <portal_type id="Contribution Tool"> - <item>Spreadsheet</item> - <item>File</item> - <item>Text</item> <item>Document Ingestion Message</item> - <item>Web Page</item> - <item>Presentation</item> <item>Drawing</item> - <item>PDF</item> + <item>File</item> <item>Image</item> + <item>PDF</item> + <item>Presentation</item> + <item>Spreadsheet</item> + <item>Text</item> + <item>Web Page</item> </portal_type> <portal_type id="Document Ingestion Module"> <item>Document Ingestion Message</item> </portal_type> <portal_type id="Document Module"> - <item>File</item> <item>Drawing</item> + <item>File</item> <item>PDF</item> - <item>Text</item> <item>Presentation</item> <item>Spreadsheet</item> + <item>Text</item> </portal_type> <portal_type id="Drawing"> - <item>Web Page</item> - <item>Role Definition</item> <item>Image</item> + <item>Role Definition</item> + <item>Web Page</item> </portal_type> <portal_type id="External Source Module"> <item>RSS Feed</item> @@ -43,28 +43,28 @@ <item>Role Definition</item> </portal_type> <portal_type id="Presentation"> - <item>Web Page</item> - <item>Role Definition</item> <item>Image</item> + <item>Role Definition</item> + <item>Web Page</item> </portal_type> <portal_type id="Spreadsheet"> + <item>Image</item> <item>Role Definition</item> <item>Web Page</item> - <item>Image</item> </portal_type> <portal_type id="Text"> <item>Image</item> - <item>Web Page</item> <item>Role Definition</item> + <item>Web Page</item> </portal_type> <portal_type id="URL Crawler"> - <item>Presentation</item> - <item>Web Page</item> - <item>Spreadsheet</item> - <item>Image</item> <item>Drawing</item> - <item>Text</item> <item>File</item> + <item>Image</item> <item>PDF</item> + <item>Presentation</item> + <item>Spreadsheet</item> + <item>Text</item> + <item>Web Page</item> </portal_type> </allowed_content_type_list> \ No newline at end of file diff --git a/bt5/erp5_dms/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_dms/PortalTypeBaseCategoryTemplateItem/base_category_list.xml index fae8761142..ecbbbb4140 100644 --- a/bt5/erp5_dms/PortalTypeBaseCategoryTemplateItem/base_category_list.xml +++ b/bt5/erp5_dms/PortalTypeBaseCategoryTemplateItem/base_category_list.xml @@ -6,9 +6,9 @@ <item>business_application</item> </portal_type> <portal_type id="Web Page"> - <item>site</item> - <item>function</item> <item>follow_up</item> + <item>function</item> <item>group</item> + <item>site</item> </portal_type> </base_category_list> \ No newline at end of file diff --git a/bt5/erp5_dms/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_dms/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml index 18552b4b06..1c7f16cd85 100644 --- a/bt5/erp5_dms/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml +++ b/bt5/erp5_dms/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml @@ -1,18 +1,18 @@ <hidden_content_type_list> <portal_type id="Contribution Tool"> - <item>Text</item> <item>Document Ingestion Message</item> - <item>Web Page</item> <item>Drawing</item> - <item>PDF</item> - <item>Spreadsheet</item> <item>File</item> <item>Image</item> + <item>PDF</item> <item>Presentation</item> + <item>Spreadsheet</item> + <item>Text</item> + <item>Web Page</item> </portal_type> <portal_type id="Drawing"> - <item>Web Page</item> <item>Image</item> + <item>Web Page</item> </portal_type> <portal_type id="Presentation"> <item>Image</item> diff --git a/bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index ed5f2e213c..a3d205ea49 100644 --- a/bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -5,19 +5,19 @@ </chain> <chain> <type>Drawing</type> - <workflow>local_permission_interaction_workflow, edit_workflow, processing_status_workflow, document_interaction_workflow, document_publication_workflow</workflow> + <workflow>document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow> </chain> <chain> <type>File</type> - <workflow>document_publication_workflow, document_interaction_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow> + <workflow>document_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow> </chain> <chain> <type>Image</type> - <workflow>document_interaction_workflow, document_publication_workflow, processing_status_workflow, local_permission_interaction_workflow</workflow> + <workflow>document_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow> </chain> <chain> <type>PDF</type> - <workflow>local_permission_interaction_workflow, edit_workflow, processing_status_workflow, document_interaction_workflow, document_publication_workflow</workflow> + <workflow>document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow> </chain> <chain> <type>Person</type> @@ -25,7 +25,7 @@ </chain> <chain> <type>Presentation</type> - <workflow>document_publication_workflow, local_permission_interaction_workflow, processing_status_workflow, document_interaction_workflow, edit_workflow</workflow> + <workflow>document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow> </chain> <chain> <type>RSS Feed</type> @@ -33,18 +33,18 @@ </chain> <chain> <type>Spreadsheet</type> - <workflow>edit_workflow, document_interaction_workflow, processing_status_workflow, document_publication_workflow, local_permission_interaction_workflow</workflow> + <workflow>document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow> </chain> <chain> <type>Text</type> - <workflow>processing_status_workflow, local_permission_interaction_workflow, document_publication_workflow, edit_workflow, document_interaction_workflow</workflow> + <workflow>document_interaction_workflow, document_publication_workflow, edit_workflow, local_permission_interaction_workflow, processing_status_workflow</workflow> </chain> <chain> <type>URL Crawler</type> - <workflow>edit_workflow, document_publication_workflow, local_permission_interaction_workflow</workflow> + <workflow>document_publication_workflow, edit_workflow, local_permission_interaction_workflow</workflow> </chain> <chain> <type>Web Page</type> - <workflow>-publication_workflow, document_interaction_workflow, local_permission_interaction_workflow, document_publication_workflow</workflow> + <workflow>-publication_workflow, document_interaction_workflow, document_publication_workflow, local_permission_interaction_workflow</workflow> </chain> </workflow_chain> \ No newline at end of file diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 63539d7bb1..a2998a8b4a 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -1119 \ No newline at end of file +1120 \ No newline at end of file -- 2.30.9