From 1b96167a21afd2a7c4c897c920f913e13c2ab5c2 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Mon, 22 Feb 2010 11:49:44 +0000
Subject: [PATCH] Use System Preference for default value of
 synchronous_metadata_discovery in case it is not specified by caller.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32940 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_ingestion/Base_contribute.xml       | 8 ++++++--
 bt5/erp5_ingestion/bt/revision                            | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
index 3732f0c940..8d9bb649ce 100644
--- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
+++ b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
@@ -60,6 +60,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
   document_kw[\'container_path\'] = context.getRelativeUrl()\n
@@ -140,7 +144,7 @@ return document\n
         </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 @@ return document\n
                 <none/>
                 <none/>
                 <none/>
-                <int>0</int>
+                <none/>
                 <int>0</int>
                 <int>0</int>
                 <int>0</int>
diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision
index d1cbcfa540..8c0474e323 100644
--- a/bt5/erp5_ingestion/bt/revision
+++ b/bt5/erp5_ingestion/bt/revision
@@ -1 +1 @@
-66
\ No newline at end of file
+69
\ No newline at end of file
-- 
2.30.9