Commit 715d5950 authored by Nicolas Delaby's avatar Nicolas Delaby

Replace follow_up category by agent category as Queries

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33701 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 55087911
<base_category_list> <base_category_list>
<portal_type id="Data Protection Request">
<item>agent</item>
</portal_type>
<portal_type id="Data Protection Request Module"> <portal_type id="Data Protection Request Module">
<item>business_application</item> <item>business_application</item>
</portal_type> </portal_type>
......
...@@ -62,7 +62,7 @@ reference_index = portal.portal_ids.generateNewId(id_group=(\'data_protection_re ...@@ -62,7 +62,7 @@ reference_index = portal.portal_ids.generateNewId(id_group=(\'data_protection_re
reference = \'DPR-%s\' % (reference_index,)\n reference = \'DPR-%s\' % (reference_index,)\n
data_protection = module.newContent(portal_type=portal_type,\n data_protection = module.newContent(portal_type=portal_type,\n
contributor_value=current_user,\n contributor_value=current_user,\n
follow_up_value=context,\n agent_value=context,\n
description=description,\n description=description,\n
reference=reference)\n reference=reference)\n
data_protection.submit()\n data_protection.submit()\n
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.ERP5Type.Document import newTempBase\n <value> <string>from Products.ERP5Type.Document import newTempBase\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
document_to_inspect = context.getFollowUpValue()\n document_to_inspect = context.getAgentValue()\n
property_map_list = document_to_inspect.getPropertyMap()\n property_map_list = document_to_inspect.getPropertyMap()\n
\n \n
def filterPropertyMapList(property_map):\n def filterPropertyMapList(property_map):\n
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>listbox_follow_up_portal_type</string> <string>listbox_agent_portal_type</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<string>Reference</string> <string>Reference</string>
</tuple> </tuple>
<tuple> <tuple>
<string>follow_up_portal_type</string> <string>agent_portal_type</string>
<string>Type</string> <string>Type</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
<string>Request Description</string> <string>Request Description</string>
</tuple> </tuple>
<tuple> <tuple>
<string>follow_up_title</string> <string>agent_title</string>
<string>Follow Up</string> <string>Context</string>
</tuple> </tuple>
<tuple> <tuple>
<string>contributor_title</string> <string>contributor_title</string>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>follow_up_portal_type</string> <string>agent_portal_type</string>
<string>Type</string> <string>Type</string>
</tuple> </tuple>
</list> </list>
...@@ -165,8 +165,8 @@ ...@@ -165,8 +165,8 @@
<string>Request Description</string> <string>Request Description</string>
</tuple> </tuple>
<tuple> <tuple>
<string>follow_up_title</string> <string>agent_title</string>
<string>Follow Up</string> <string>Context</string>
</tuple> </tuple>
<tuple> <tuple>
<string>contributor_title</string> <string>contributor_title</string>
...@@ -196,8 +196,8 @@ ...@@ -196,8 +196,8 @@
<string>Request Description</string> <string>Request Description</string>
</tuple> </tuple>
<tuple> <tuple>
<string>follow_up_title</string> <string>agent_title</string>
<string>Follow Up</string> <string>Context</string>
</tuple> </tuple>
<tuple> <tuple>
<string>contributor_title</string> <string>contributor_title</string>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_follow_up_portal_type</string> </value> <value> <string>listbox_agent_portal_type</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -58,7 +58,7 @@ selection_name = \'data_protection_request_erase_data_selection\'\n ...@@ -58,7 +58,7 @@ selection_name = \'data_protection_request_erase_data_selection\'\n
property_id_list = portal.portal_selections.getSelectionCheckedUidsFor(selection_name)\n property_id_list = portal.portal_selections.getSelectionCheckedUidsFor(selection_name)\n
# clean up selection\n # clean up selection\n
portal.portal_selections.setSelectionCheckedUidsFor(selection_name, ())\n portal.portal_selections.setSelectionCheckedUidsFor(selection_name, ())\n
document_to_cleanup = context.getFollowUpValue()\n document_to_cleanup = context.getAgentValue()\n
clean_up_done = False\n clean_up_done = False\n
\n \n
# First: Purge workflow history comments\n # First: Purge workflow history comments\n
......
...@@ -77,9 +77,7 @@ ...@@ -77,9 +77,7 @@
<item> <item>
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list/>
<string>my_text_content</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -87,6 +85,7 @@ ...@@ -87,6 +85,7 @@
<value> <value>
<list> <list>
<string>my_description</string> <string>my_description</string>
<string>my_text_content</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -103,7 +102,7 @@ ...@@ -103,7 +102,7 @@
<value> <value>
<list> <list>
<string>my_reference</string> <string>my_reference</string>
<string>my_follow_up_title</string> <string>my_agent_title</string>
<string>your_follow_up_portal_type</string> <string>your_follow_up_portal_type</string>
</list> </list>
</value> </value>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_follow_up_title</string> </value> <value> <string>my_agent_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -527,7 +527,7 @@ ...@@ -527,7 +527,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Follow Up</string> </value> <value> <string>Context</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getFollowUpValue() is not None and here.getFollowUpValue().getTranslatedPortalType() or None</string> </value> <value> <string>python: here.getAgentValue() is not None and here.getAgentValue().getTranslatedPortalType() or None</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
<key> <string>center</string> </key> <key> <string>center</string> </key>
<value> <value>
<list> <list>
<string>your_agent_title</string>
<string>your_flush_worklfow_history_comment</string> <string>your_flush_worklfow_history_comment</string>
</list> </list>
</value> </value>
...@@ -99,9 +100,7 @@ ...@@ -99,9 +100,7 @@
<item> <item>
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list/>
<string>your_follow_title</string>
</list>
</value> </value>
</item> </item>
<item> <item>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<global name="StringField" module="Products.Formulator.StandardFields"/> <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
<tuple/> <tuple/>
</tuple> </tuple>
</pickle> </pickle>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>your_follow_title</string> </value> <value> <string>your_agent_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -21,13 +21,33 @@ ...@@ -21,13 +21,33 @@
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>The input failed the external validator.</string> </value>
</item> </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> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value> <value> <string>Input is required but no input given.</string> </value>
</item> </item>
<item> <item>
<key> <string>too_long</string> </key> <key> <string>too_long</string> </key>
<value> <string>Too much input was given.</string> </value> <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> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -36,10 +56,34 @@ ...@@ -36,10 +56,34 @@
<key> <string>overrides</string> </key> <key> <string>overrides</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -76,18 +120,74 @@ ...@@ -76,18 +120,74 @@
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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> <item>
<key> <string>max_length</string> </key> <key> <string>max_length</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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>proxy_listbox_ids</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>relation_form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>relation_setter_id</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -100,6 +200,10 @@ ...@@ -100,6 +200,10 @@
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>update_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -111,10 +215,34 @@ ...@@ -111,10 +215,34 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -153,18 +281,76 @@ ...@@ -153,18 +281,76 @@
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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> <item>
<key> <string>max_length</string> </key> <key> <string>max_length</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>relation_form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>relation_setter_id</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -177,6 +363,10 @@ ...@@ -177,6 +363,10 @@
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>update_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -188,10 +378,36 @@ ...@@ -188,10 +378,36 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>base_category</string> </key>
<value> <string>agent</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> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -210,7 +426,7 @@ ...@@ -210,7 +426,7 @@
</item> </item>
<item> <item>
<key> <string>display_width</string> </key> <key> <string>display_width</string> </key>
<value> <int>80</int> </value> <value> <int>20</int> </value>
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
...@@ -228,21 +444,92 @@ ...@@ -228,21 +444,92 @@
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </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> <item>
<key> <string>max_length</string> </key> <key> <string>max_length</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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>All portal_types</string>
<string>All portal_types</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>relation_form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>relation_setter_id</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>size</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Follow Up</string> </value> <value> <string>Context</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -252,6 +539,10 @@ ...@@ -252,6 +539,10 @@
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>update_method</string> </key>
<value> <string>Base_validateRelation</string> </value>
</item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
...@@ -273,7 +564,23 @@ ...@@ -273,7 +564,23 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:\'%s - %s - %s\' % (here.getFollowUpValue().getTranslatedPortalType(), here.getFollowUpReference() or \'\', here.getFollowUpTitle())</string> </value> <value> <string>here/getAgentTitle</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [(portal_type_id, portal_type_id) for portal_type_id in here.getPortalObject().portal_types.objectIds()]</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
24 27
\ No newline at end of file \ No newline at end of file
Data Protection Request Module | business_application Data Protection Request Module | business_application
\ No newline at end of file Data Protection Request | agent
\ No newline at end of file
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