[Erp5-report] r35712 ivan - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_skin...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri May 28 12:36:07 CEST 2010
Author: ivan
Date: Fri May 28 12:36:05 2010
New Revision: 35712
URL: http://svn.erp5.org?rev=35712&view=rev
Log:
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.
Modified:
erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getPropertyDictFromUserLogin.xml
erp5/trunk/bt5/erp5_ingestion/bt/revision
Modified: erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml?rev=35712&r1=35711&r2=35712&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml [utf8] Fri May 28 12:36:05 2010
@@ -67,7 +67,12 @@
if redirect_to_document is None:\n
redirect_to_document = portal.portal_preferences.isPreferredRedirectToDocument(False)\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[\'user_login\'] = user_login\n
if use_context_for_container:\n
document_kw[\'container_path\'] = context.getRelativeUrl()\n
if portal_type not in MARKER:\n
@@ -99,7 +104,7 @@
document.processFile()\n
merged_document = document.Document_convertToBaseFormatAndDiscoverMetadata(\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
document = merged_document\n
# introspect document and find editable properties\n
@@ -156,7 +161,7 @@
</item>
<item>
<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>
<key> <string>errors</string> </key>
@@ -176,7 +181,7 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>11</int> </value>
+ <value> <int>12</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -193,6 +198,7 @@
<string>redirect_url</string>
<string>editable_mode</string>
<string>follow_up_list</string>
+ <string>user_login</string>
<string>kw</string>
<string>Products.ERP5Type.Message</string>
<string>translateString</string>
@@ -203,6 +209,7 @@
<string>portal</string>
<string>portal_contributions</string>
<string>False</string>
+ <string>str</string>
<string>document_kw</string>
<string>_write_</string>
<string>_apply_</string>
@@ -211,7 +218,6 @@
<string>message</string>
<string>getattr</string>
<string>is_existing_document_updated</string>
- <string>str</string>
<string>merged_document</string>
<string>document_edit_kw</string>
<string>property_id_list</string>
@@ -248,6 +254,7 @@
<none/>
<int>1</int>
<none/>
+ <none/>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getPropertyDictFromUserLogin.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getPropertyDictFromUserLogin.xml?rev=35712&r1=35711&r2=35712&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getPropertyDictFromUserLogin.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_getPropertyDictFromUserLogin.xml [utf8] Fri May 28 12:36:05 2010
@@ -58,7 +58,8 @@
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
"""\n
-return {}\n
+assignment_dict = context.ERP5Site_getPersonAssignmentDict(user_name=user_name)\n
+return assignment_dict\n
</string> </value>
</item>
<item>
@@ -96,6 +97,9 @@
<value>
<tuple>
<string>user_name</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>assignment_dict</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=35712&r1=35711&r2=35712&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Fri May 28 12:36:05 2010
@@ -1,1 +1,1 @@
-96
+97
More information about the Erp5-report
mailing list