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

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Dec 17 14:54:57 2008
New Revision: 24928

URL: http://svn.erp5.org?rev=24928&view=rev
Log:
If "Data Color" is defined expliclty in the OOoChart configuration, it already starts with "#", so we must handle it explicitly here

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml?rev=24928&r1=24927&r2=24928&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/OOoChart_macroLibrary.xml [utf8] Wed Dec 17 14:54:57 2008
@@ -107,7 +107,8 @@
                               chart:interpolation request/interpolation ;"/>\n
       <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.088cm"\n
                                 tal:define="step python:2000000;\n
-                                hex_colour_code python:\'#%s\' % colour_column_dict.get(column_id, hex(int(\'ccccff\', 16) + (index*step))[2:8].zfill(6))"\n
+                                            hex_colour_code python:colour_column_dict.get(column_id, hex(int(\'ccccff\', 16) + (index*step))[2:8].zfill(6));\n
+                                            hex_colour_code python:test(hex_colour_code.startswith(\'#\'), hex_colour_code, \'#%s\' % hex_colour_code)"\n
                                 tal:attributes="svg:stroke-color hex_colour_code;\n
                                 draw:fill-color hex_colour_code"\n
                                 dr3d:edge-rounding="0%"/>\n
@@ -194,7 +195,8 @@
     </table:table>\n
   </tal:block>\n
 \n
-</office:document-content>
+</office:document-content>\n
+
 
 ]]></string> </value>
         </item>

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=24928&r1=24927&r2=24928&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Dec 17 14:54:57 2008
@@ -1,1 +1,1 @@
-1047
+1048