[Erp5-report] r34638 jerome - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_sk...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Apr 19 10:10:04 2010
New Revision: 34638

URL: http://svn.erp5.org?rev=34638&view=rev
Log:
call methods on the preferences tool, not on the active preference

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=34638&r1=34637&r2=34638&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 Apr 19 10:10:04 2010
@@ -60,19 +60,11 @@
 portal = context.getPortalObject()\n
 portal_contributions = portal.portal_contributions\n
 \n
-system_preference = portal.portal_preferences.getActiveSystemPreference()\n
 if synchronous_metadata_discovery is None:\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
+  synchronous_metadata_discovery = portal.portal_preferences.isPreferredSynchronousMetadataDiscovery(False)\n
 \n
 if redirect_to_document is None:\n
-  if system_preference is not None:\n
-    redirect_to_document = system_preference.isPreferredRedirectToDocument()\n
-  else:\n
-    redirect_to_document = False\n
+  redirect_to_document = portal.portal_preferences.isPreferredRedirectToDocument(False)\n
 \n
 document_kw = {}\n
 if use_context_for_container:\n
@@ -200,7 +192,6 @@
                             <string>context</string>
                             <string>portal</string>
                             <string>portal_contributions</string>
-                            <string>system_preference</string>
                             <string>False</string>
                             <string>document_kw</string>
                             <string>_write_</string>

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=34638&r1=34637&r2=34638&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Mon Apr 19 10:10:04 2010
@@ -1,1 +1,1 @@
-87
+89