Commit 430663f3 authored by Jean-Paul Smets's avatar Jean-Paul Smets

Use follow_up instead of source_project

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16007 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ca46d3b1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<portal_type id="Web Page"> <portal_type id="Web Page">
<item>group</item> <item>group</item>
<item>site</item> <item>site</item>
<item>source_project</item> <item>follow_up</item>
<item>function</item> <item>function</item>
</portal_type> </portal_type>
</base_category_list> </base_category_list>
\ No newline at end of file
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<value> <value>
<list> <list>
<string>my_classification_list</string> <string>my_classification_list</string>
<string>my_source_project_title</string> <string>my_follow_up_title</string>
<string>my_publication_section</string> <string>my_publication_section</string>
<string>my_function</string> <string>my_function</string>
<string>my_group</string> <string>my_group</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>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
using regular expression defined in preferences. \n using regular expression defined in preferences. \n
\n \n
Uses provided arguments to generate document\'s reference, language, \n Uses provided arguments to generate document\'s reference, language, \n
title, source_project and/or source_conference.\n title, follow_up and/or source_conference.\n
\n \n
If necessary can do additional things (like mapping\n If necessary can do additional things (like mapping\n
portal type id to portal type name).\n portal type id to portal type name).\n
...@@ -93,7 +93,7 @@ local_id = property_dict.get(\'local_id\', \'undefined\')\n ...@@ -93,7 +93,7 @@ local_id = property_dict.get(\'local_id\', \'undefined\')\n
reference = property_dict.get(\'reference\', None)\n reference = property_dict.get(\'reference\', None)\n
group_reference_path = property_dict.get(\'group_reference_path\', None)\n group_reference_path = property_dict.get(\'group_reference_path\', None)\n
source_conference_reference = property_dict.get(\'source_conference_reference\', None)\n source_conference_reference = property_dict.get(\'source_conference_reference\', None)\n
source_project_reference = property_dict.get(\'source_project_reference\', None)\n follow_up_reference = property_dict.get(\'follow_up_reference\', None)\n
\n \n
new_dict = dict(language = language, \n new_dict = dict(language = language, \n
version = version)\n version = version)\n
...@@ -102,17 +102,17 @@ if reference:\n ...@@ -102,17 +102,17 @@ if reference:\n
# we get directly extracted reference in property_dict (from re pattern)\n # we get directly extracted reference in property_dict (from re pattern)\n
# this method has highest priority\n # this method has highest priority\n
pass\n pass\n
elif source_project_reference:\n elif follow_up_reference:\n
# generate document\'s reference using project reference\n # generate document\'s reference using project reference\n
reference = \'P-%s-%s\' %(source_project_reference, local_id)\n reference = \'P-%s-%s\' %(follow_up_reference, local_id)\n
project = context.portal_catalog.getResultValue(reference = source_project_reference,\n project = context.portal_catalog.getResultValue(reference = follow_up_reference,\n
portal_type = \'Project\')\n portal_type = \'Project\')\n
if project:\n if project:\n
new_dict[\'source_project\'] = project.getRelativeUrl()\n new_dict[\'follow_up\'] = project.getRelativeUrl()\n
elif source_conference_reference:\n elif source_conference_reference:\n
# generate document\'s reference using conference reference\n # generate document\'s reference using conference reference\n
reference = \'C-%s-%s\' % (source_conference_reference, local_id)\n reference = \'C-%s-%s\' % (source_conference_reference, local_id)\n
conference = context.portal_catalog.getResultValue(reference = source_project_reference,\n conference = context.portal_catalog.getResultValue(reference = follow_up_reference,\n
portal_type = \'Conference\')\n portal_type = \'Conference\')\n
if conference:\n if conference:\n
new_dict[\'source_conference\'] = conference.getRelativeUrl()\n new_dict[\'source_conference\'] = conference.getRelativeUrl()\n
...@@ -205,7 +205,7 @@ return new_dict\n ...@@ -205,7 +205,7 @@ return new_dict\n
<string>reference</string> <string>reference</string>
<string>group_reference_path</string> <string>group_reference_path</string>
<string>source_conference_reference</string> <string>source_conference_reference</string>
<string>source_project_reference</string> <string>follow_up_reference</string>
<string>dict</string> <string>dict</string>
<string>new_dict</string> <string>new_dict</string>
<string>context</string> <string>context</string>
......
...@@ -102,7 +102,7 @@ except AttributeError:\n ...@@ -102,7 +102,7 @@ except AttributeError:\n
doc_info[\'group\'] = \'\'\n doc_info[\'group\'] = \'\'\n
\n \n
try:\n try:\n
doc_info[\'project\'] = context.getSourceProjectTitle() or \'\'\n doc_info[\'project\'] = context.getFollowUpTitle() or \'\'\n
except AttributeError:\n except AttributeError:\n
doc_info[\'project\'] = \'\'\n doc_info[\'project\'] = \'\'\n
\n \n
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<value> <value>
<list> <list>
<string>my_dms_category_list</string> <string>my_dms_category_list</string>
<string>my_source_project_title</string> <string>my_follow_up_title</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
</item> </item>
<item> <item>
<key> <string>base_category</string> </key> <key> <string>base_category</string> </key>
<value> <string>source_project</string> </value> <value> <string>follow_up</string> </value>
</item> </item>
<item> <item>
<key> <string>catalog_index</string> </key> <key> <string>catalog_index</string> </key>
...@@ -552,7 +552,7 @@ ...@@ -552,7 +552,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:here.Base_getRelatedObjectTitle(\'source_project\')</string> </value> <value> <string>python:here.Base_getRelatedObjectTitle(\'follow_up\')</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -76,7 +76,7 @@ policies (defined with wildcard, like "personal/*" or "*/project") applies to th ...@@ -76,7 +76,7 @@ policies (defined with wildcard, like "personal/*" or "*/project") applies to th
Classification has to have two levels, and first level is translated into a selected second-level\n Classification has to have two levels, and first level is translated into a selected second-level\n
classification.\n classification.\n
\n \n
Some classifications require something more to apply (like */project requires source_project), but\n Some classifications require something more to apply (like */project requires follow_up), but\n
this check can be skipped by setting membershiponly to True.\n this check can be skipped by setting membershiponly to True.\n
"""\n """\n
\n \n
...@@ -99,7 +99,7 @@ pol = policy.split(\'/\')\n ...@@ -99,7 +99,7 @@ pol = policy.split(\'/\')\n
if not membershiponly:\n if not membershiponly:\n
# project policies do not apply if we don\'t have source_project\n # project policies do not apply if we don\'t have source_project\n
if pol[1] == \'project\':\n if pol[1] == \'project\':\n
if context.getSourceProject() == None:\n if context.getFollowUp() == None:\n
return False\n return False\n
\n \n
# if all conditions are met, check if the policy is ok (wildcards are ok)\n # if all conditions are met, check if the policy is ok (wildcards are ok)\n
......
...@@ -75,7 +75,7 @@ A script returning security categories from a Person\'s assignments.\n ...@@ -75,7 +75,7 @@ A script returning security categories from a Person\'s assignments.\n
\n \n
Differences to the stock implementation:\n Differences to the stock implementation:\n
\n \n
* if category is source_project, we look for destination_project\n * if category is follow_up, we look for destination_project\n
\n \n
* if category not strict, we return not only the category, but also all its parents\n * if category not strict, we return not only the category, but also all its parents\n
(unless we say it is strict)\n (unless we say it is strict)\n
...@@ -108,7 +108,7 @@ for assignment in person_object.contentValues(filter={\'portal_type\': \'Assignm ...@@ -108,7 +108,7 @@ for assignment in person_object.contentValues(filter={\'portal_type\': \'Assignm
if assignment.getValidationState() == \'open\':\n if assignment.getValidationState() == \'open\':\n
try:\n try:\n
for base_category in base_category_list:\n for base_category in base_category_list:\n
if base_category == \'source_project\':\n if base_category == \'follow_up\':\n
category_value = assignment.getDestinationProject()\n category_value = assignment.getDestinationProject()\n
else:\n else:\n
category_value = assignment.getProperty(base_category)\n category_value = assignment.getProperty(base_category)\n
......
...@@ -81,7 +81,7 @@ for person_object in object.getDestinationValueList(portal_type=\'Person\'):\n ...@@ -81,7 +81,7 @@ for person_object in object.getDestinationValueList(portal_type=\'Person\'):\n
if assignment.getValidationState() == \'open\':\n if assignment.getValidationState() == \'open\':\n
category_dict = {}\n category_dict = {}\n
for base_category in base_category_list:\n for base_category in base_category_list:\n
if base_category == \'source_project\':\n if base_category == \'follow_up\':\n
category_value = assignment.getDestinationProject()\n category_value = assignment.getDestinationProject()\n
else:\n else:\n
category_value = assignment.getProperty(base_category)\n category_value = assignment.getProperty(base_category)\n
......
...@@ -85,7 +85,7 @@ for assignment in person_object.contentValues(filter={\'portal_type\': \'Assignm ...@@ -85,7 +85,7 @@ for assignment in person_object.contentValues(filter={\'portal_type\': \'Assignm
if assignment.getValidationState() == \'open\':\n if assignment.getValidationState() == \'open\':\n
category_dict = {}\n category_dict = {}\n
for base_category in base_category_list:\n for base_category in base_category_list:\n
if base_category == \'source_project\':\n if base_category == \'follow_up\':\n
category_value = assignment.getDestinationProject()\n category_value = assignment.getDestinationProject()\n
else:\n else:\n
category_value = assignment.getProperty(base_category)\n category_value = assignment.getProperty(base_category)\n
......
...@@ -78,8 +78,8 @@ deprecated ERP5Type_asSecurityGroupIdList\n ...@@ -78,8 +78,8 @@ deprecated ERP5Type_asSecurityGroupIdList\n
\n \n
return (\n return (\n
(\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'function\'] ),\n (\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'function\'] ),\n
(\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'source_project\'] ),\n (\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'follow_up\'] ),\n
(\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'function\', \'source_project\'] ),\n (\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'function\', \'follow_up\'] ),\n
(\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'group\'] ),\n (\'ERP5Type_getSecurityCategoryFromAssignmentStrict\', [\'group\'] ),\n
(\'ERP5Type_getSecurityCategoryRoot\', [\'group\']),\n (\'ERP5Type_getSecurityCategoryRoot\', [\'group\']),\n
)\n )\n
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<value> <value>
<list> <list>
<string>link</string> <string>link</string>
<string>my_source_project_title</string> <string>my_follow_up_title</string>
<string>my_classification</string> <string>my_classification</string>
<string>my_dms_category_list</string> <string>my_dms_category_list</string>
</list> </list>
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<string>my_group_list</string> <string>my_group_list</string>
<string>my_site_list</string> <string>my_site_list</string>
<string>my_function_list</string> <string>my_function_list</string>
<string>my_source_project_title</string> <string>my_follow_up_title</string>
<string>my_publication_section_list</string> <string>my_publication_section_list</string>
<string>my_translated_validation_state_title</string> <string>my_translated_validation_state_title</string>
<string>my_subject_list</string> <string>my_subject_list</string>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<string>my_group_list</string> <string>my_group_list</string>
<string>my_site_list</string> <string>my_site_list</string>
<string>my_function_list</string> <string>my_function_list</string>
<string>my_source_project_title</string> <string>my_follow_up_title</string>
<string>my_publication_section_list</string> <string>my_publication_section_list</string>
<string>my_translated_validation_state_title</string> <string>my_translated_validation_state_title</string>
</list> </list>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<string>my_group_list</string> <string>my_group_list</string>
<string>my_site_list</string> <string>my_site_list</string>
<string>my_function_list</string> <string>my_function_list</string>
<string>my_source_project_title</string> <string>my_follow_up_title</string>
<string>my_publication_section_list</string> <string>my_publication_section_list</string>
<string>my_translated_validation_state_title</string> <string>my_translated_validation_state_title</string>
</list> </list>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<string>my_group_list</string> <string>my_group_list</string>
<string>my_site_list</string> <string>my_site_list</string>
<string>my_function_list</string> <string>my_function_list</string>
<string>my_source_project_title</string> <string>my_follow_up_title</string>
<string>my_publication_section_list</string> <string>my_publication_section_list</string>
<string>my_translated_validation_state_title</string> <string>my_translated_validation_state_title</string>
</list> </list>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_project_title</string> </value> <value> <string>my_follow_up_title</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Form.ProxyField</string>
<string>ProxyField</string>
</tuple>
<none/>
</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</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>extra_context</string> </key>
<value> <string></string> </value>
</item>
<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>extra_context</string> </key>
<value> <string></string> </value>
</item>
<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>extra_context</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_follow_up_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Document_library</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>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Form.ProxyField</string>
<string>ProxyField</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_source_project_title</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>extra_context</string> </key>
<value> <string></string> </value>
</item>
<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>extra_context</string> </key>
<value> <string></string> </value>
</item>
<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>extra_context</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_source_project_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Document_library</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>
Web Page | function Web Page | function
Web Page | group Web Page | group
Web Page | site Web Page | site
Web Page | source_project Web Page | follow_up
\ No newline at end of file \ 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