From aff491c0c1f1952c636d5b4f5c9bfb2132ff812c Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Tue, 8 Jan 2008 13:53:06 +0000 Subject: [PATCH] 2008-1-8 Yusei * Added another follow_up field relate document to person and organisation in several document view forms. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18629 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_dms/Base_getRelatedObjectTitle.xml | 30 +- .../Base_getRelatedObjectTitleList.xml | 19 +- .../Base_getRelatedObjectValueList.xml | 23 +- .../DocumentIngestionMessage_view.xml | 8 +- .../my_follow_up_title_list.xml | 104 ++++ .../erp5_dms/Document_viewFieldLibrary.xml | 1 + .../my_follow_up_title_list.xml | 578 ++++++++++++++++++ .../erp5_dms/ExternalSource_view.xml | 1 + .../my_follow_up_title_list.xml | 104 ++++ .../portal_skins/erp5_dms/File_view.xml | 1 + .../File_view/my_follow_up_title_list.xml | 104 ++++ .../portal_skins/erp5_dms/Image_view.xml | 1 + .../Image_view/my_follow_up_title_list.xml | 104 ++++ .../erp5_dms/OOoDocument_view.xml | 1 + .../my_follow_up_title_list.xml | 93 +++ .../portal_skins/erp5_dms/WebPage_view.xml | 1 + .../WebPage_view/my_follow_up_title_list.xml | 104 ++++ bt5/erp5_dms/bt/change_log | 5 + bt5/erp5_dms/bt/revision | 2 +- 19 files changed, 1245 insertions(+), 39 deletions(-) create mode 100644 bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentIngestionMessage_view/my_follow_up_title_list.xml create mode 100644 bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary/my_follow_up_title_list.xml create mode 100644 bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view/my_follow_up_title_list.xml create mode 100644 bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_follow_up_title_list.xml create mode 100644 bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_view/my_follow_up_title_list.xml create mode 100644 bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_follow_up_title_list.xml create mode 100644 bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/WebPage_view/my_follow_up_title_list.xml diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml index 2f4ed66cb5..8d3ce87247 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> </tuple> </pickle> <pickle> @@ -73,12 +70,13 @@ get related object title in a security-aware way (without throwing exception\n if I don\'t have permissions to access the object)\n """\n \n -base_category = context.getProperty(category)\n -if base_category is None:\n +title_list = context.Base_getRelatedObjectTitleList(category, portal_type_list)\n +\n +if title_list:\n + return title_list[0]\n +else:\n return \'\'\n \n -ob = context.restrictedTraverse(base_category, None)\n -return ob is not None and ob.getTitle() or \'\'\n # XXX-JPS What would be the problem in using getMyCategoryTitle() ?\n </string> </value> </item> @@ -102,7 +100,7 @@ return ob is not None and ob.getTitle() or \'\'\n </item> <item> <key> <string>_params</string> </key> - <value> <string>category</string> </value> + <value> <string>category, portal_type_list=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -122,18 +120,18 @@ return ob is not None and ob.getTitle() or \'\'\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>category</string> + <string>portal_type_list</string> <string>_getattr_</string> <string>context</string> - <string>base_category</string> - <string>None</string> - <string>ob</string> + <string>title_list</string> + <string>_getitem_</string> </tuple> </value> </item> @@ -145,7 +143,9 @@ return ob is not None and ob.getTitle() or \'\'\n <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitleList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitleList.xml index 3b13430cef..0dfbfbb934 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitleList.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitleList.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> </tuple> </pickle> <pickle> @@ -73,7 +70,8 @@ get related object title list in a security-aware way (without throwing exceptio if I don\'t have permissions to access the object)\n """\n \n -object_list = context.Base_getRelatedObjectValueList(base_category)\n +object_list = context.Base_getRelatedObjectValueList(base_category, portal_type_list)\n +\n title_list = [o.getTitle() for o in object_list]\n \n return filter(lambda t:t!=\'\', title_list)\n @@ -99,7 +97,7 @@ return filter(lambda t:t!=\'\', title_list)\n </item> <item> <key> <string>_params</string> </key> - <value> <string>base_category</string> </value> + <value> <string>base_category, portal_type_list=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -119,13 +117,14 @@ return filter(lambda t:t!=\'\', title_list)\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>base_category</string> + <string>portal_type_list</string> <string>_getattr_</string> <string>context</string> <string>object_list</string> @@ -146,7 +145,9 @@ return filter(lambda t:t!=\'\', title_list)\n <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectValueList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectValueList.xml index 50c1d6107c..fe1604a06c 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectValueList.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectValueList.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> </tuple> </pickle> <pickle> @@ -82,7 +79,12 @@ def getValueIfAvailable(category):\n return ob \n \n object_list = [getValueIfAvailable(category) for category in category_list]\n -return [o for o in object_list if o is not None]\n +object_list = [o for o in object_list if o is not None]\n +\n +if portal_type_list is not None:\n + object_list = [o for o in object_list if o.portal_type in portal_type_list]\n +\n +return object_list\n </string> </value> </item> <item> @@ -105,7 +107,7 @@ return [o for o in object_list if o is not None]\n </item> <item> <key> <string>_params</string> </key> - <value> <string>base_category</string> </value> + <value> <string>base_category, portal_type_list=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -125,13 +127,14 @@ return [o for o in object_list if o is not None]\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>base_category</string> + <string>portal_type_list</string> <string>_getattr_</string> <string>context</string> <string>category_list</string> @@ -154,7 +157,9 @@ return [o for o in object_list if o is not None]\n <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentIngestionMessage_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentIngestionMessage_view.xml index a3b0bfd7f6..36ad70c73d 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentIngestionMessage_view.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentIngestionMessage_view.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5Form.Form</string> - <string>ERP5Form</string> - </tuple> - <none/> + <global name="ERP5Form" module="Products.ERP5Form.Form"/> + <tuple/> </tuple> </pickle> <pickle> @@ -128,6 +125,7 @@ <string>my_site_list</string> <string>my_function_list</string> <string>my_follow_up_title</string> + <string>my_follow_up_title_list</string> <string>my_publication_section_list</string> <string>my_translated_simulation_state_title</string> </list> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentIngestionMessage_view/my_follow_up_title_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentIngestionMessage_view/my_follow_up_title_list.xml new file mode 100644 index 0000000000..c1eae3eb69 --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentIngestionMessage_view/my_follow_up_title_list.xml @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>view_separator</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Document_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<br />\n + + +]]></string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary.xml index 8b029eea0b..8a16eae613 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary.xml @@ -119,6 +119,7 @@ <string>my_translated_external_processing_state_title</string> <string>my_revision</string> <string>my_follow_up_title</string> + <string>my_follow_up_title_list</string> </list> </value> </item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary/my_follow_up_title_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary/my_follow_up_title_list.xml new file mode 100644 index 0000000000..e102ac6b37 --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_viewFieldLibrary/my_follow_up_title_list.xml @@ -0,0 +1,578 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="MultiRelationStringField" module="Products.ERP5Form.MultiRelationField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>line_too_long</string> </key> + <value> <string>A line was too long.</string> </value> + </item> + <item> + <key> <string>relation_result_ambiguous</string> </key> + <value> <string>Select appropriate document in the list.</string> </value> + </item> + <item> + <key> <string>relation_result_empty</string> </key> + <value> <string>No such document was found.</string> </value> + </item> + <item> + <key> <string>relation_result_too_long</string> </key> + <value> <string>Too many documents were found.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>too_long</string> </key> + <value> <string>You entered too many characters.</string> </value> + </item> + <item> + <key> <string>too_many_lines</string> </key> + <value> <string>You entered too many lines.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_creation</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>allow_jump</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>base_category</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>catalog_index</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>container_getter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>jump_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>parameter_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>relation_setter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>update_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_creation</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>allow_jump</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>base_category</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>catalog_index</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>container_getter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>jump_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>parameter_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>relation_setter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>update_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_creation</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>allow_jump</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>base_category</string> </key> + <value> <string>follow_up</string> </value> + </item> + <item> + <key> <string>catalog_index</string> </key> + <value> <string>title</string> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>container_getter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <int>5</int> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>jump_method</string> </key> + <value> <string>Base_jumpToRelatedDocument</string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>parameter_list</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> + <list> + <tuple> + <string>Person</string> + <string>Person</string> + </tuple> + <tuple> + <string>Organisation</string> + <string>Organisation</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>relation_setter_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Follow up</string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>update_method</string> </key> + <value> <string>Base_validateRelation</string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<br /> + +]]></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <int>40</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:here.Base_getRelatedObjectTitleList(\'follow_up\', portal_type_list=[i[0] for i in field.get_value(\'portal_type\')])</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view.xml index 0ea7f44e5d..0ba2e369a7 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view.xml @@ -127,6 +127,7 @@ <string>my_site_list</string> <string>my_function_list</string> <string>my_follow_up_title</string> + <string>my_follow_up_title_list</string> <string>my_publication_section_list</string> <string>my_translated_validation_state_title</string> <string>my_subject_list</string> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view/my_follow_up_title_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view/my_follow_up_title_list.xml new file mode 100644 index 0000000000..c1eae3eb69 --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalSource_view/my_follow_up_title_list.xml @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>view_separator</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Document_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<br />\n + + +]]></string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> 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 index 6e37c35e07..9561c68acb 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view.xml @@ -138,6 +138,7 @@ <string>my_site_list</string> <string>my_function_list</string> <string>my_follow_up_title</string> + <string>my_follow_up_title_list</string> <string>my_publication_section_list</string> <string>my_translated_validation_state_title</string> </list> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_follow_up_title_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_follow_up_title_list.xml new file mode 100644 index 0000000000..c1eae3eb69 --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/File_view/my_follow_up_title_list.xml @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>view_separator</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Document_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<br />\n + + +]]></string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_view.xml index 5d24de7b3d..73510dc911 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_view.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_view.xml @@ -138,6 +138,7 @@ <string>my_site_list</string> <string>my_function_list</string> <string>my_follow_up_title</string> + <string>my_follow_up_title_list</string> <string>my_publication_section_list</string> <string>my_translated_validation_state_title</string> </list> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_view/my_follow_up_title_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_view/my_follow_up_title_list.xml new file mode 100644 index 0000000000..c1eae3eb69 --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_view/my_follow_up_title_list.xml @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>view_separator</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Document_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<br />\n + + +]]></string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml index 9c1c569a7f..3d2be2b876 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml @@ -138,6 +138,7 @@ <string>my_site_list</string> <string>my_function_list</string> <string>my_follow_up_title</string> + <string>my_follow_up_title_list</string> <string>my_publication_section_list</string> <string>my_translated_validation_state_title</string> </list> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_follow_up_title_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_follow_up_title_list.xml new file mode 100644 index 0000000000..f3353059b8 --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/my_follow_up_title_list.xml @@ -0,0 +1,93 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Document_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/WebPage_view.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/WebPage_view.xml index 587128e516..ecf76f7e13 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/WebPage_view.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/WebPage_view.xml @@ -144,6 +144,7 @@ <string>my_site_list</string> <string>my_function_list</string> <string>my_follow_up_title</string> + <string>my_follow_up_title_list</string> <string>my_publication_section_list</string> <string>my_translated_validation_state_title</string> </list> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/WebPage_view/my_follow_up_title_list.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/WebPage_view/my_follow_up_title_list.xml new file mode 100644 index 0000000000..c1eae3eb69 --- /dev/null +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/WebPage_view/my_follow_up_title_list.xml @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>view_separator</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_follow_up_title_list</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Document_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>view_separator</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<br />\n + + +]]></string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_dms/bt/change_log b/bt5/erp5_dms/bt/change_log index 8111329782..4b364814f8 100644 --- a/bt5/erp5_dms/bt/change_log +++ b/bt5/erp5_dms/bt/change_log @@ -1,3 +1,8 @@ +2008-1-8 Yusei +* Added another follow_up field relate +document to person and organisation +in several document view forms. + 2007-12-21 Yusei * Refactored ingestion system. Please use revision 18459 or newer of ERP5 and ERP5OOo. * version up (0.9.1 -> 0.9.2) diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index c04091d820..3430d41490 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -790 \ No newline at end of file +792 \ No newline at end of file -- 2.30.9