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

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Feb 22 15:16:09 2010
New Revision: 32963

URL: http://svn.erp5.org?rev=32963&view=rev
Log:
If not a system preference is specified, do not raise but instead fall back to default value of preferences.

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=32963&r1=32962&r2=32963&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 15:16:09 2010
@@ -62,11 +62,17 @@
 \n
 system_preference = portal.portal_preferences.getActiveSystemPreference()\n
 if synchronous_metadata_discovery is None:\n
-  # not specified, fallback to site system preference configuration\n
-  synchronous_metadata_discovery = system_preference.isPreferredSynchronousMetadataDiscovery()\n
+  if system_preference is not None:\n
+    # not specified, fallback to site system preference configuration\n
+    synchronous_metadata_discovery = system_preference.isPreferredSynchronousMetadataDiscovery()\n
+  else:\n
+    synchronous_metadata_discovery = False\n
 \n
 if redirect_to_document is None:\n
-  redirect_to_document = system_preference.isPreferredRedirectToDocument()\n
+  if system_preference is not None:\n
+    redirect_to_document = system_preference.isPreferredRedirectToDocument()\n
+  else:\n
+    redirect_to_document = False\n
 \n
 document_kw = {}\n
 if use_context_for_container:\n
@@ -191,6 +197,7 @@
                             <string>portal</string>
                             <string>portal_contributions</string>
                             <string>system_preference</string>
+                            <string>False</string>
                             <string>document_kw</string>
                             <string>_write_</string>
                             <string>_apply_</string>
@@ -198,7 +205,6 @@
                             <string>message</string>
                             <string>getattr</string>
                             <string>file_name</string>
-                            <string>False</string>
                             <string>is_existing_document_updated</string>
                             <string>merged_document</string>
                             <string>document_edit_kw</string>

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=32963&r1=32962&r2=32963&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Mon Feb 22 15:16:09 2010
@@ -1,1 +1,1 @@
-72
+73