[Erp5-report] r18430 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Dec 19 17:50:22 2007
New Revision: 18430

URL: http://svn.erp5.org?rev=18430&view=rev
Log:
If style is forced in the request, Preference_getReportFormatItemList should honor this forced style

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getReportFormatItemList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getReportFormatItemList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getReportFormatItemList.xml?rev=18430&r1=18429&r2=18430&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getReportFormatItemList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getReportFormatItemList.xml Wed Dec 19 17:50:22 2007
@@ -68,7 +68,9 @@
             <value> <string>portal = context.getPortalObject()\n
 N_ = portal.Base_translateString\n
 \n
-style = context.getPreferredReportStyle()\n
+style = container.REQUEST.get(\'your_portal_skin\',\n
+                              context.getPreferredReportStyle())\n
+\n
 item_list = [(\'\', \'\')]\n
 \n
 if style == \'ODS\':\n
@@ -131,6 +133,7 @@
                             <string>context</string>
                             <string>portal</string>
                             <string>N_</string>
+                            <string>container</string>
                             <string>style</string>
                             <string>item_list</string>
                           </tuple>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=18430&r1=18429&r2=18430&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Wed Dec 19 17:50:22 2007
@@ -1,1 +1,1 @@
-651
+653