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

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Dec 19 19:55:18 CET 2007


Author: jerome
Date: Wed Dec 19 19:55:18 2007
New Revision: 18441

URL: http://svn.erp5.org?rev=18441&view=rev
Log:
`format` field for dialog should honor forced skin name.
Note that we use:
request.get('your_portal_skin', request.get('field_your_portal_skin', ...)
* your_portal_skin is for the
* field_your_portal_skin is for Base_callDialogMethod, which iterates on form.get_fields, which will not return the field unless it's enabled. Maybe Base_callDialogMethod should use form.get_fields(include_disabled=1)  ?

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_format.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_format.xml?rev=18441&r1=18440&r2=18441&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_format.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_format.xml Wed Dec 19 19:55:18 2007
@@ -295,7 +295,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: preferences.getPreference(\'preferred_report_style\', \'Print\') in (\'ODS\', \'ODT\')</string> </value>
+            <value> <string>python: request.get(\'your_portal_skin\', request.get(\'field_your_portal_skin\', preferences.getPreference(\'preferred_report_style\', \'Print\'))) in (\'ODS\', \'ODT\')</string> </value>
         </item>
       </dictionary>
     </pickle>

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=18441&r1=18440&r2=18441&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Wed Dec 19 19:55:18 2007
@@ -1,1 +1,1 @@
-654
+656




More information about the Erp5-report mailing list