[Erp5-report] r32940 ivan - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Feb 22 12:49:44 2010
New Revision: 32940

URL: http://svn.erp5.org?rev=32940&view=rev
Log:
Use System Preference for default value of synchronous_metadata_discovery in case it is not specified by caller.

Modified:
    erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.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=32940&r1=32939&r2=32940&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] Mon Feb 22 12:49:44 2010
@@ -59,6 +59,10 @@
 MARKER = [\'\', None]\n
 portal = context.getPortalObject()\n
 portal_contributions = portal.portal_contributions\n
+\n
+if synchronous_metadata_discovery is None:\n
+  # not specified, fallback to site system preference configuration\n
+  synchronous_metadata_discovery = portal.portal_preferences.getActiveSystemPreference().isPreferredSynchronousMetadataDiscovery()\n
 \n
 document_kw = {}\n
 if use_context_for_container:\n
@@ -140,7 +144,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>file=None, url=None, portal_type=None, classification=None, synchronous_metadata_discovery=False, redirect_to_document=False, attach_document_to_context=False, use_context_for_container=False, redirect_url=None, **kw</string> </value>
+            <value> <string>file=None, url=None, portal_type=None, classification=None, synchronous_metadata_discovery=None, redirect_to_document=False, attach_document_to_context=False, use_context_for_container=False, redirect_url=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -220,7 +224,7 @@
                 <none/>
                 <none/>
                 <none/>
-                <int>0</int>
+                <none/>
                 <int>0</int>
                 <int>0</int>
                 <int>0</int>

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=32940&r1=32939&r2=32940&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Mon Feb 22 12:49:44 2010
@@ -1,1 +1,1 @@
-66
+69