[Erp5-report] r33750 nicolas.dumazet - in /erp5/trunk/bt5/erp5_pdm: SkinTemplateItem/portal...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 16 10:35:47 CET 2010
Author: nicolas.dumazet
Date: Tue Mar 16 10:35:46 2010
New Revision: 33750
URL: http://svn.erp5.org?rev=33750&view=rev
Log:
revert r33738, and fix the issue correctly.
* Replace deprecated "columns", "lines" & "tabs" properties of matrixbox by the
shiny, better "as_cell_range_script_id"
* check that cell is not None when rendering matrixbox_quantity
Modified:
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_matrixbox.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_matrixbox.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_quantity.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_asCellRange.xml
erp5/trunk/bt5/erp5_pdm/bt/revision
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_matrixbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_matrixbox.xml?rev=33750&r1=33749&r2=33750&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_matrixbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_quantity_matrixbox.xml [utf8] Tue Mar 16 10:35:46 2010
@@ -125,9 +125,7 @@
</item>
<item>
<key> <string>columns</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
@@ -171,15 +169,11 @@
</item>
<item>
<key> <string>lines</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>tabs</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -217,7 +211,7 @@
</item>
<item>
<key> <string>as_cell_range_script_id</string> </key>
- <value> <string></string> </value>
+ <value> <string>TransformedResource_asCellRange</string> </value>
</item>
<item>
<key> <string>cell_base_id</string> </key>
@@ -331,54 +325,6 @@
</item>
</dictionary>
</value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:here.TransformedResource_asCellRange(base_id=\'quantity\',matrixbox=1)[1]</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:here.TransformedResource_asCellRange(base_id=\'quantity\',matrixbox=1)[0]</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="4" aka="AAAAAAAAAAQ=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:here.TransformedResource_asCellRange(base_id=\'quantity\',matrixbox=1)[2]</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_matrixbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_matrixbox.xml?rev=33750&r1=33749&r2=33750&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_matrixbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewFieldLibrary/my_variation_matrixbox.xml [utf8] Tue Mar 16 10:35:46 2010
@@ -125,9 +125,7 @@
</item>
<item>
<key> <string>columns</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
@@ -171,15 +169,11 @@
</item>
<item>
<key> <string>lines</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>tabs</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -217,7 +211,7 @@
</item>
<item>
<key> <string>as_cell_range_script_id</string> </key>
- <value> <string></string> </value>
+ <value> <string>TransformedResource_asCellRange</string> </value>
</item>
<item>
<key> <string>cell_base_id</string> </key>
@@ -331,54 +325,6 @@
</item>
</dictionary>
</value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:here.TransformedResource_asCellRange(base_id=\'variation\',matrixbox=1)[1]</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:here.TransformedResource_asCellRange(base_id=\'variation\',matrixbox=1)[0]</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="4" aka="AAAAAAAAAAQ=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:here.TransformedResource_asCellRange(base_id=\'variation\',matrixbox=1)[2]</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_quantity.xml?rev=33750&r1=33749&r2=33750&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_quantity.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformationTransformedResource_viewQuantity/matrixbox_quantity.xml [utf8] Tue Mar 16 10:35:46 2010
@@ -13,8 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>default</string>
<string>title</string>
- <string>default</string>
</list>
</value>
</item>
@@ -74,6 +74,10 @@
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -118,7 +122,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.getProperty(\'quantity\')</string> </value>
+ <value> <string>python: cell is not None and cell.getProperty(\'quantity\')</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_asCellRange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_asCellRange.xml?rev=33750&r1=33749&r2=33750&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_asCellRange.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/TransformedResource_asCellRange.xml [utf8] Tue Mar 16 10:35:46 2010
@@ -91,11 +91,6 @@
# Remove empty range\n
cell_range = filter(lambda x: x != [], cell_range)\n
\n
-dimension = len(cell_range)\n
-if matrixbox and dimension<3:\n
- # Matrixbox view always expects three dimensions (lines, columns, tabs)\n
- # It costs very little to avoid noisy rendering tracebacks\n
- return cell_range + [[]]*(3-dimension)\n
return cell_range\n
@@ -152,8 +147,6 @@
<string>getattr</string>
<string>_getitem_</string>
<string>map</string>
- <string>len</string>
- <string>dimension</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/revision?rev=33750&r1=33749&r2=33750&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] Tue Mar 16 10:35:46 2010
@@ -1,1 +1,1 @@
-470
+471
More information about the Erp5-report
mailing list