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

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Dec 19 17:55:39 2007
New Revision: 18432

URL: http://svn.erp5.org?rev=18432&view=rev
Log:
The "portal_skin" field should not show the style when style is forced by passing portal_skin in the request

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_portal_skin.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_portal_skin.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_portal_skin.xml?rev=18432&r1=18431&r2=18432&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_portal_skin.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_portal_skin.xml Wed Dec 19 17:55:39 2007
@@ -291,7 +291,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: context.Base_translateString("%s Style" % preferences.getPreference(\'preferred_report_style\', \'Print\'))</string> </value>
+            <value> <string>python: request.get(\'your_portal_skin\', None) is None and context.Base_translateString("%s Style" % preferences.getPreference(\'preferred_report_style\', \'Print\')) or \'\'</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=18432&r1=18431&r2=18432&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:55:39 2007
@@ -1,1 +1,1 @@
-653
+654