[Erp5-report] r20956 - /erp5/trunk/products/ERP5Form/MatrixBox.py

[nobody at svn.erp5.org]

Author: jm
Date: Wed May 14 12:59:48 2008
New Revision: 20956

URL: http://svn.erp5.org?rev=20956&view=rev
Log:
Fix bug in matrixbox: an empty cell may display the value of another cell.

Modified:
    erp5/trunk/products/ERP5Form/MatrixBox.py

Modified: erp5/trunk/products/ERP5Form/MatrixBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/MatrixBox.py?rev=20956&r1=20955&r2=20956&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/MatrixBox.py (original)
+++ erp5/trunk/products/ERP5Form/MatrixBox.py Wed May 14 12:59:48 2008
@@ -297,6 +297,7 @@
               kwd = {}
               kwd['base_id'] = cell_base_id
               cell = cell_getter_method(*kw, **kwd)
+              REQUEST['cell'] = cell
 
               cell_body = ''
 
@@ -308,9 +309,8 @@
                   if cell != None:
                     attribute_value = my_field.get_value('default',
                            cell=cell, cell_index=kw, cell_position = (i,j,k))
-                  
+
                     if render_format=='html':
-                      REQUEST['cell'] = cell
                       display_value = attribute_value
 
                       if field_errors.has_key(key):
@@ -338,7 +338,6 @@
                     attribute_value = my_field.get_value('default', cell=None,
                         cell_index=kw, cell_position=(i,j,k))
                     if render_format == 'html':
-                      REQUEST['cell'] = None
                       cell_body += str(my_field.render(value=attribute_value,
                                       REQUEST=REQUEST, key=key))
                     elif render_format == 'list':