[Erp5-report] r32951 ivan - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_skin...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Feb 22 13:23:11 CET 2010
Author: ivan
Date: Mon Feb 22 13:23:11 2010
New Revision: 32951
URL: http://svn.erp5.org?rev=32951&view=rev
Log:
Use system preference to determine to redirect user to ingested document or not.
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=32951&r1=32950&r2=32951&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 13:23:11 2010
@@ -60,9 +60,13 @@
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
# not specified, fallback to site system preference configuration\n
- synchronous_metadata_discovery = portal.portal_preferences.getActiveSystemPreference().isPreferredSynchronousMetadataDiscovery()\n
+ synchronous_metadata_discovery = system_preference.isPreferredSynchronousMetadataDiscovery()\n
+\n
+if redirect_to_document is None:\n
+ redirect_to_document = system_preference.isPreferredRedirectToDocument()\n
\n
document_kw = {}\n
if use_context_for_container:\n
@@ -144,7 +148,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=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=None, attach_document_to_context=False, use_context_for_container=False, redirect_url=None, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -186,6 +190,7 @@
<string>context</string>
<string>portal</string>
<string>portal_contributions</string>
+ <string>system_preference</string>
<string>document_kw</string>
<string>_write_</string>
<string>_apply_</string>
@@ -225,7 +230,7 @@
<none/>
<none/>
<none/>
- <int>0</int>
+ <none/>
<int>0</int>
<int>0</int>
<none/>
Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=32951&r1=32950&r2=32951&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Mon Feb 22 13:23:11 2010
@@ -1,1 +1,1 @@
-69
+71
More information about the Erp5-report
mailing list