[Erp5-report] r33648 nicolas.dumazet - /erp5/trunk/products/ERP5Type/XMLMatrix.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Mar 11 14:53:33 2010
New Revision: 33648

URL: http://svn.erp5.org?rev=33648&view=rev
Log:
Fix issue when an XMLMatrix has child objects that are not Cells: 
in this case _checkConsistency should not examine those children objects.
It might be better to filter portal types directly in contentValues.

Modified:
    erp5/trunk/products/ERP5Type/XMLMatrix.py

Modified: erp5/trunk/products/ERP5Type/XMLMatrix.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/XMLMatrix.py?rev=33648&r1=33647&r2=33648&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/XMLMatrix.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/XMLMatrix.py [utf8] Thu Mar 11 14:53:33 2010
@@ -646,7 +646,8 @@
             # the last item is a coordinate not part of base_id
             object_id_split.pop()
 
-        if base_id is not None:
+        current_dimension = len(cell_coordinate_list)
+        if current_dimension > 0 and base_id is not None:
             if not self.index.has_key(base_id):
               # The matrix does not have this base_id
               addError("There is no index for base_id %s" % base_id)
@@ -665,7 +666,6 @@
                 del base_item[key]
 
             len_id = len(base_item)
-            current_dimension = len(cell_coordinate_list)
             if current_dimension != len_id:
               addError("Dimension of cell is %s but should be %s" % (current_dimension,
                                                                      len_id))