From 290c25b1a62c61ffdda07e23ae7244369171f029 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Wed, 27 Apr 2011 18:43:09 +0000 Subject: [PATCH] merge with experimental: - Typo - remove not used files - clean up script git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45706 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../registered_skin_selection.xml | 8 +- .../cloudooo_web/WebSection_uploadFile.xml | 120 ++++-------------- bt5/cloudooo_web/bt/categories_list | 0 bt5/cloudooo_web/bt/change_log | 0 bt5/cloudooo_web/bt/comment | 0 bt5/cloudooo_web/bt/provision_list | 0 bt5/cloudooo_web/bt/revision | 2 +- .../bt/template_base_category_list | 0 .../bt/template_catalog_datetime_key_list | 0 .../bt/template_catalog_full_text_key_list | 0 .../bt/template_catalog_keyword_key_list | 0 .../bt/template_catalog_local_role_key_list | 0 .../bt/template_catalog_method_id_list | 0 .../bt/template_catalog_multivalue_key_list | 0 .../bt/template_catalog_related_key_list | 0 .../bt/template_catalog_request_key_list | 0 .../bt/template_catalog_result_key_list | 0 .../bt/template_catalog_result_table_list | 0 .../bt/template_catalog_role_key_list | 0 .../bt/template_catalog_scriptable_key_list | 0 .../bt/template_catalog_topic_key_list | 0 .../bt/template_constraint_id_list | 0 bt5/cloudooo_web/bt/template_document_id_list | 0 .../bt/template_extension_id_list | 0 bt5/cloudooo_web/bt/template_local_role_list | 0 bt5/cloudooo_web/bt/template_local_roles_list | 0 .../bt/template_message_translation_list | 0 bt5/cloudooo_web/bt/template_module_id_list | 0 bt5/cloudooo_web/bt/template_path_list | 0 ...late_portal_type_allowed_content_type_list | 0 .../template_portal_type_base_category_list | 0 ...plate_portal_type_hidden_content_type_list | 0 .../bt/template_portal_type_id_list | 0 .../template_portal_type_property_sheet_list | 0 .../bt/template_portal_type_role_list | 0 .../bt/template_portal_type_roles_list | 0 .../template_portal_type_workflow_chain_list | 0 bt5/cloudooo_web/bt/template_preference_list | 0 bt5/cloudooo_web/bt/template_product_id_list | 0 .../bt/template_property_sheet_id_list | 0 .../template_registered_skin_selection_list | 8 +- bt5/cloudooo_web/bt/template_role_list | 0 .../bt/template_site_property_id_list | 0 bt5/cloudooo_web/bt/template_test_id_list | 0 bt5/cloudooo_web/bt/template_tool_id_list | 0 ...template_update_business_template_workflow | 1 - bt5/cloudooo_web/bt/template_update_tool | 1 - bt5/cloudooo_web/bt/template_workflow_id_list | 0 48 files changed, 33 insertions(+), 107 deletions(-) delete mode 100644 bt5/cloudooo_web/bt/categories_list delete mode 100644 bt5/cloudooo_web/bt/change_log delete mode 100644 bt5/cloudooo_web/bt/comment delete mode 100644 bt5/cloudooo_web/bt/provision_list delete mode 100644 bt5/cloudooo_web/bt/template_base_category_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_datetime_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_full_text_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_keyword_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_local_role_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_method_id_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_multivalue_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_related_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_request_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_result_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_result_table_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_role_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_scriptable_key_list delete mode 100644 bt5/cloudooo_web/bt/template_catalog_topic_key_list delete mode 100644 bt5/cloudooo_web/bt/template_constraint_id_list delete mode 100644 bt5/cloudooo_web/bt/template_document_id_list delete mode 100644 bt5/cloudooo_web/bt/template_extension_id_list delete mode 100644 bt5/cloudooo_web/bt/template_local_role_list delete mode 100644 bt5/cloudooo_web/bt/template_local_roles_list delete mode 100644 bt5/cloudooo_web/bt/template_message_translation_list delete mode 100644 bt5/cloudooo_web/bt/template_module_id_list delete mode 100644 bt5/cloudooo_web/bt/template_path_list delete mode 100644 bt5/cloudooo_web/bt/template_portal_type_allowed_content_type_list delete mode 100644 bt5/cloudooo_web/bt/template_portal_type_base_category_list delete mode 100644 bt5/cloudooo_web/bt/template_portal_type_hidden_content_type_list delete mode 100644 bt5/cloudooo_web/bt/template_portal_type_id_list delete mode 100644 bt5/cloudooo_web/bt/template_portal_type_property_sheet_list delete mode 100644 bt5/cloudooo_web/bt/template_portal_type_role_list delete mode 100644 bt5/cloudooo_web/bt/template_portal_type_roles_list delete mode 100644 bt5/cloudooo_web/bt/template_portal_type_workflow_chain_list delete mode 100644 bt5/cloudooo_web/bt/template_preference_list delete mode 100644 bt5/cloudooo_web/bt/template_product_id_list delete mode 100644 bt5/cloudooo_web/bt/template_property_sheet_id_list delete mode 100644 bt5/cloudooo_web/bt/template_role_list delete mode 100644 bt5/cloudooo_web/bt/template_site_property_id_list delete mode 100644 bt5/cloudooo_web/bt/template_test_id_list delete mode 100644 bt5/cloudooo_web/bt/template_tool_id_list delete mode 100644 bt5/cloudooo_web/bt/template_update_business_template_workflow delete mode 100644 bt5/cloudooo_web/bt/template_update_tool delete mode 100644 bt5/cloudooo_web/bt/template_workflow_id_list diff --git a/bt5/cloudooo_web/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml b/bt5/cloudooo_web/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml index 8f39050637..796eedde3b 100644 --- a/bt5/cloudooo_web/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml +++ b/bt5/cloudooo_web/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml @@ -1,18 +1,18 @@ <registered_skin_selection> <skin_folder_selection> <skin_folder>cloudooo_erp5_base</skin_folder> - <skin_selection>Claudooo,View</skin_selection> + <skin_selection>View,Cloudooo</skin_selection> </skin_folder_selection> <skin_folder_selection> <skin_folder>cloudooo_erp5_ingestion</skin_folder> - <skin_selection>Claudooo,View</skin_selection> + <skin_selection>View,Cloudooo</skin_selection> </skin_folder_selection> <skin_folder_selection> <skin_folder>cloudooo_web</skin_folder> - <skin_selection>Claudooo,View</skin_selection> + <skin_selection>Cloudooo,View</skin_selection> </skin_folder_selection> <skin_folder_selection> <skin_folder>cloudooo_web_theme</skin_folder> - <skin_selection>Claudooo</skin_selection> + <skin_selection>Cloudooo</skin_selection> </skin_folder_selection> </registered_skin_selection> \ No newline at end of file diff --git a/bt5/cloudooo_web/SkinTemplateItem/portal_skins/cloudooo_web/WebSection_uploadFile.xml b/bt5/cloudooo_web/SkinTemplateItem/portal_skins/cloudooo_web/WebSection_uploadFile.xml index ed7a214756..63c6aed910 100644 --- a/bt5/cloudooo_web/SkinTemplateItem/portal_skins/cloudooo_web/WebSection_uploadFile.xml +++ b/bt5/cloudooo_web/SkinTemplateItem/portal_skins/cloudooo_web/WebSection_uploadFile.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> </pickle> <pickle> <dictionary> @@ -70,27 +67,28 @@ person = module.newContent(portal_type=\'Person\',\n description=context.REQUEST.get(\'HTTP_X_FORWARDED_FOR\',\'Found no ip\'),\n )\n person.setGroup(reference)\n -assignement = person.newContent(portal_type="Assignment",group="my_group")\n -assignement.open()\n +assignment = person.newContent(portal_type="Assignment", group="my_group")\n +assignment.open()\n person.validate()\n \n -document = context.Base_contribute(file=file, \n -url=None, \n -portal_type=None, \n -classification="personal/private", \n -synchronous_metadata_discovery=None, \n -redirect_to_document=False, \n -attach_document_to_context=False, \n -use_context_for_container=False, \n -redirect_url=None, \n -cancel_url=None, \n -batch_mode=False, \n -max_repeat=0, \n -editable_mode = 1, \n -follow_up_list=None, \n -user_login=reference,\n -reference=reference\n -)\n +document = context.Base_contribute(file=file,\n + url=None,\n + portal_type=None,\n + classification="personal/private",\n + synchronous_metadata_discovery=None,\n + redirect_to_document=False,\n + attach_document_to_context=False,\n + use_context_for_container=False,\n + redirect_url=None,\n + cancel_url=None,\n + batch_mode=False,\n + max_repeat=0,\n + editable_mode = 1,\n + follow_up_list=None,\n + user_login=reference,\n + reference=reference\n + )\n +\n #XXX-Conflict between contributor property and contributor property. We must use value to be sure to use the property\n document.setContributorValue(person);\n original_name = document.getSourceReference()\n @@ -113,18 +111,13 @@ session = portal_sessions[reference]\n session[\'document_url\'] = document.getRelativeUrl()\n \n #Redirect the user on waiting conversion dialog\n -context.Base_redirect(\'WebSection_viewWaitingConversion\',keep_items={\'portal_status_message\': "Please wait : we are converting your file",\n - param: key})\n +context.Base_redirect(\'WebSection_viewWaitingConversion\',\n + keep_items={\'portal_status_message\': "Please wait : we are converting your file",\n + param: key})\n ]]></string> </value> </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>file,**kw</string> </value> @@ -139,75 +132,10 @@ context.Base_redirect(\'WebSection_viewWaitingConversion\',keep_items={\'portal_ </tuple> </value> </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>file</string> - <string>kw</string> - <string>_getattr_</string> - <string>context</string> - <string>portal</string> - <string>reference</string> - <string>module</string> - <string>person</string> - <string>assignement</string> - <string>None</string> - <string>False</string> - <string>document</string> - <string>original_name</string> - <string>dot_position</string> - <string>_getitem_</string> - <string>_getiter_</string> - <string>param</string> - <string>key</string> - <string>portal_sessions</string> - <string>session</string> - <string>_write_</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>WebSection_uploadFile</string> </value> </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> </dictionary> </pickle> </record> diff --git a/bt5/cloudooo_web/bt/categories_list b/bt5/cloudooo_web/bt/categories_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/change_log b/bt5/cloudooo_web/bt/change_log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/comment b/bt5/cloudooo_web/bt/comment deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/provision_list b/bt5/cloudooo_web/bt/provision_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/revision b/bt5/cloudooo_web/bt/revision index d8263ee986..e440e5c842 100644 --- a/bt5/cloudooo_web/bt/revision +++ b/bt5/cloudooo_web/bt/revision @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file diff --git a/bt5/cloudooo_web/bt/template_base_category_list b/bt5/cloudooo_web/bt/template_base_category_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_datetime_key_list b/bt5/cloudooo_web/bt/template_catalog_datetime_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_full_text_key_list b/bt5/cloudooo_web/bt/template_catalog_full_text_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_keyword_key_list b/bt5/cloudooo_web/bt/template_catalog_keyword_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_local_role_key_list b/bt5/cloudooo_web/bt/template_catalog_local_role_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_method_id_list b/bt5/cloudooo_web/bt/template_catalog_method_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_multivalue_key_list b/bt5/cloudooo_web/bt/template_catalog_multivalue_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_related_key_list b/bt5/cloudooo_web/bt/template_catalog_related_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_request_key_list b/bt5/cloudooo_web/bt/template_catalog_request_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_result_key_list b/bt5/cloudooo_web/bt/template_catalog_result_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_result_table_list b/bt5/cloudooo_web/bt/template_catalog_result_table_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_role_key_list b/bt5/cloudooo_web/bt/template_catalog_role_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_scriptable_key_list b/bt5/cloudooo_web/bt/template_catalog_scriptable_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_catalog_topic_key_list b/bt5/cloudooo_web/bt/template_catalog_topic_key_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_constraint_id_list b/bt5/cloudooo_web/bt/template_constraint_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_document_id_list b/bt5/cloudooo_web/bt/template_document_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_extension_id_list b/bt5/cloudooo_web/bt/template_extension_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_local_role_list b/bt5/cloudooo_web/bt/template_local_role_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_local_roles_list b/bt5/cloudooo_web/bt/template_local_roles_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_message_translation_list b/bt5/cloudooo_web/bt/template_message_translation_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_module_id_list b/bt5/cloudooo_web/bt/template_module_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_path_list b/bt5/cloudooo_web/bt/template_path_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_portal_type_allowed_content_type_list b/bt5/cloudooo_web/bt/template_portal_type_allowed_content_type_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_portal_type_base_category_list b/bt5/cloudooo_web/bt/template_portal_type_base_category_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_portal_type_hidden_content_type_list b/bt5/cloudooo_web/bt/template_portal_type_hidden_content_type_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_portal_type_id_list b/bt5/cloudooo_web/bt/template_portal_type_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_portal_type_property_sheet_list b/bt5/cloudooo_web/bt/template_portal_type_property_sheet_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_portal_type_role_list b/bt5/cloudooo_web/bt/template_portal_type_role_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_portal_type_roles_list b/bt5/cloudooo_web/bt/template_portal_type_roles_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_portal_type_workflow_chain_list b/bt5/cloudooo_web/bt/template_portal_type_workflow_chain_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_preference_list b/bt5/cloudooo_web/bt/template_preference_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_product_id_list b/bt5/cloudooo_web/bt/template_product_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_property_sheet_id_list b/bt5/cloudooo_web/bt/template_property_sheet_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_registered_skin_selection_list b/bt5/cloudooo_web/bt/template_registered_skin_selection_list index ca5546b57e..207c5018c8 100644 --- a/bt5/cloudooo_web/bt/template_registered_skin_selection_list +++ b/bt5/cloudooo_web/bt/template_registered_skin_selection_list @@ -1,7 +1,7 @@ -cloudooo_erp5_base | Claudooo +cloudooo_erp5_base | Cloudooo cloudooo_erp5_base | View -cloudooo_erp5_ingestion | Claudooo +cloudooo_erp5_ingestion | Cloudooo cloudooo_erp5_ingestion | View -cloudooo_web | Claudooo +cloudooo_web | Cloudooo cloudooo_web | View -cloudooo_web_theme | Claudooo \ No newline at end of file +cloudooo_web_theme | Cloudooo \ No newline at end of file diff --git a/bt5/cloudooo_web/bt/template_role_list b/bt5/cloudooo_web/bt/template_role_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_site_property_id_list b/bt5/cloudooo_web/bt/template_site_property_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_test_id_list b/bt5/cloudooo_web/bt/template_test_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_tool_id_list b/bt5/cloudooo_web/bt/template_tool_id_list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bt5/cloudooo_web/bt/template_update_business_template_workflow b/bt5/cloudooo_web/bt/template_update_business_template_workflow deleted file mode 100644 index c227083464..0000000000 --- a/bt5/cloudooo_web/bt/template_update_business_template_workflow +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/bt5/cloudooo_web/bt/template_update_tool b/bt5/cloudooo_web/bt/template_update_tool deleted file mode 100644 index c227083464..0000000000 --- a/bt5/cloudooo_web/bt/template_update_tool +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/bt5/cloudooo_web/bt/template_workflow_id_list b/bt5/cloudooo_web/bt/template_workflow_id_list deleted file mode 100644 index e69de29bb2..0000000000 -- 2.30.9