Commit 2d7d9371 authored by Ivan Tyagov's avatar Ivan Tyagov

Use user_login in meta data discovery in both synchronous & asynchronous mode.

Implement Document_getPropertyDictFromUserLogin in a way so that properties can be extracted from Person's assignment definitions.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35712 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f0c8b581
...@@ -67,7 +67,12 @@ if synchronous_metadata_discovery is None:\n ...@@ -67,7 +67,12 @@ if synchronous_metadata_discovery is None:\n
if redirect_to_document is None:\n if redirect_to_document is None:\n
redirect_to_document = portal.portal_preferences.isPreferredRedirectToDocument(False)\n redirect_to_document = portal.portal_preferences.isPreferredRedirectToDocument(False)\n
\n \n
if user_login is None:\n
# get current authenticated user\n
user_login = str(portal.portal_membership.getAuthenticatedMember())\n
\n
document_kw = {}\n document_kw = {}\n
document_kw[\'user_login\'] = user_login\n
if use_context_for_container:\n if use_context_for_container:\n
document_kw[\'container_path\'] = context.getRelativeUrl()\n document_kw[\'container_path\'] = context.getRelativeUrl()\n
if portal_type not in MARKER:\n if portal_type not in MARKER:\n
...@@ -99,7 +104,7 @@ if synchronous_metadata_discovery:\n ...@@ -99,7 +104,7 @@ if synchronous_metadata_discovery:\n
document.processFile()\n document.processFile()\n
merged_document = document.Document_convertToBaseFormatAndDiscoverMetadata(\n merged_document = document.Document_convertToBaseFormatAndDiscoverMetadata(\n
file_name=file_name,\n file_name=file_name,\n
user_login=str(portal.portal_membership.getAuthenticatedMember()))\n user_login=user_login)\n
is_existing_document_updated = (merged_document!=document)\n is_existing_document_updated = (merged_document!=document)\n
document = merged_document\n document = merged_document\n
# introspect document and find editable properties\n # introspect document and find editable properties\n
...@@ -156,7 +161,7 @@ return document\n ...@@ -156,7 +161,7 @@ return document\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>file=None, url=None, portal_type=None, classification=None, synchronous_metadata_discovery=None, redirect_to_document=None, attach_document_to_context=False, use_context_for_container=False, redirect_url=None, editable_mode = 1, follow_up_list=None, **kw</string> </value> <value> <string>file=None, url=None, portal_type=None, classification=None, synchronous_metadata_discovery=None, redirect_to_document=None, attach_document_to_context=False, use_context_for_container=False, redirect_url=None, editable_mode = 1, follow_up_list=None, user_login=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -176,7 +181,7 @@ return document\n ...@@ -176,7 +181,7 @@ return document\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>11</int> </value> <value> <int>12</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -193,6 +198,7 @@ return document\n ...@@ -193,6 +198,7 @@ return document\n
<string>redirect_url</string> <string>redirect_url</string>
<string>editable_mode</string> <string>editable_mode</string>
<string>follow_up_list</string> <string>follow_up_list</string>
<string>user_login</string>
<string>kw</string> <string>kw</string>
<string>Products.ERP5Type.Message</string> <string>Products.ERP5Type.Message</string>
<string>translateString</string> <string>translateString</string>
...@@ -203,6 +209,7 @@ return document\n ...@@ -203,6 +209,7 @@ return document\n
<string>portal</string> <string>portal</string>
<string>portal_contributions</string> <string>portal_contributions</string>
<string>False</string> <string>False</string>
<string>str</string>
<string>document_kw</string> <string>document_kw</string>
<string>_write_</string> <string>_write_</string>
<string>_apply_</string> <string>_apply_</string>
...@@ -211,7 +218,6 @@ return document\n ...@@ -211,7 +218,6 @@ return document\n
<string>message</string> <string>message</string>
<string>getattr</string> <string>getattr</string>
<string>is_existing_document_updated</string> <string>is_existing_document_updated</string>
<string>str</string>
<string>merged_document</string> <string>merged_document</string>
<string>document_edit_kw</string> <string>document_edit_kw</string>
<string>property_id_list</string> <string>property_id_list</string>
...@@ -248,6 +254,7 @@ return document\n ...@@ -248,6 +254,7 @@ return document\n
<none/> <none/>
<int>1</int> <int>1</int>
<none/> <none/>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -58,7 +58,8 @@ Gets document properties discovered from the user who contributes / owns the doc ...@@ -58,7 +58,8 @@ Gets document properties discovered from the user who contributes / owns the doc
User would be usually the current user, but sometimes the name has to be given explicitly\n User would be usually the current user, but sometimes the name has to be given explicitly\n
if e.g. the doc is contributed by email, and the script is run by zope user.\n if e.g. the doc is contributed by email, and the script is run by zope user.\n
"""\n """\n
return {}\n assignment_dict = context.ERP5Site_getPersonAssignmentDict(user_name=user_name)\n
return assignment_dict\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -96,6 +97,9 @@ return {}\n ...@@ -96,6 +97,9 @@ return {}\n
<value> <value>
<tuple> <tuple>
<string>user_name</string> <string>user_name</string>
<string>_getattr_</string>
<string>context</string>
<string>assignment_dict</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
96 97
\ 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