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

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jan 16 15:18:04 2008
New Revision: 18740

URL: http://svn.erp5.org?rev=18740&view=rev
Log:
Preference_getReportFormatItemList: 
Also get the field value as unvalidated value from the REQUEST, because this script will be called when validating a dialog using Base_viewDialogFieldLibrary/your_format


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=18740&r1=18739&r2=18740&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 Jan 16 15:18:04 2008
@@ -67,9 +67,11 @@
             <key> <string>_body</string> </key>
             <value> <string>portal = context.getPortalObject()\n
 N_ = portal.Base_translateString\n
+request = container.REQUEST\n
 \n
-style = container.REQUEST.get(\'your_portal_skin\',\n
-                              context.getPreferredReportStyle())\n
+style = request.get(\'your_portal_skin\',\n
+        request.get(\'field_your_portal_skin\',\n
+                              context.getPreferredReportStyle()))\n
 \n
 item_list = [(\'\', \'\')]\n
 \n
@@ -134,6 +136,7 @@
                             <string>portal</string>
                             <string>N_</string>
                             <string>container</string>
+                            <string>request</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=18740&r1=18739&r2=18740&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Wed Jan 16 15:18:04 2008
@@ -1,1 +1,1 @@
-671
+673