[Erp5-report] r40900 arnaud.fontaine - in /erp5/trunk/products/ERP5: Document/ PropertySheet/

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Tue Nov 30 07:55:21 2010
New Revision: 40900

URL: http://svn.erp5.org?rev=40900&view=rev
Log:
Add Trade Model Line Cell Consistency Constraint for ZODB Property Sheets

Added:
    erp5/trunk/products/ERP5/Document/TradeModelLineCellConsistencyConstraint.py
      - copied, changed from r40897, erp5/trunk/products/ERP5/Constraint/TradeModelLineCellConsistency.py
    erp5/trunk/products/ERP5/PropertySheet/TradeModelLineCellConsistencyConstraint.py

Copied: erp5/trunk/products/ERP5/Document/TradeModelLineCellConsistencyConstraint.py (from r40897, erp5/trunk/products/ERP5/Constraint/TradeModelLineCellConsistency.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeModelLineCellConsistencyConstraint.py?p2=erp5/trunk/products/ERP5/Document/TradeModelLineCellConsistencyConstraint.py&p1=erp5/trunk/products/ERP5/Constraint/TradeModelLineCellConsistency.py&r1=40897&r2=40900&rev=40900&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Constraint/TradeModelLineCellConsistency.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TradeModelLineCellConsistencyConstraint.py [utf8] Tue Nov 30 07:55:21 2010
@@ -1,7 +1,8 @@
 ##############################################################################
 #
-# Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
-#          Fabien Morin <fabien at nexedi.com>
+# Copyright (c) 2009-2010 Nexedi SA and Contributors. All Rights Reserved.
+#                         Fabien Morin <fabien at nexedi.com>
+#                         Arnaud Fontaine <arnaud.fontaine at nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -26,32 +27,38 @@
 #
 ##############################################################################
 
-from Products.ERP5Type.Constraint import Constraint
-translateString = lambda msg, **kw: msg # just to extract messages
-_MARKER = []
+from Products.ERP5Type.mixin.constraint import ConstraintMixin
+from Products.ERP5Type import PropertySheet
 
-
-class TradeModelLineCellConsistency(Constraint):
+class TradeModelLineCellConsistencyConstraint(ConstraintMixin):
   """
   This constraint checks if the Trade Model Line should contain cells (if
   variation categories are defined on it)
+
+  This is only relevant for ZODB Property Sheets (filesystem Property
+  Sheets rely on Products.ERP5.Constraint.TradeModelLineCellConsistency
+  instead).
   """
+  meta_type = 'ERP5 Trade Model Line Cell Consistency Constraint'
+  portal_type = 'Trade Model Line Cell Consistency Constraint'
 
-  _message_id_list = [ 'message_cell_inexistance',]
-  message_cell_inexistance = translateString(
-      'Missing cells on line "${line}"')
+  property_sheets = (PropertySheet.SimpleItem,
+                     PropertySheet.Predicate,
+                     PropertySheet.Reference,
+                     PropertySheet.TradeModelLineCellConsistencyConstraint)
 
   def checkConsistency(self, document, fixit=0):
     """
-      Implement here the consistency checker
+    Check the object's consistency
     """
-    error_list = []
-    base_id = self.constraint_definition['base_id']
+    if not self.test(document):
+      return []
+
+    base_id = self.getBaseId()
     for cell_coordinates in document.getCellKeyList(base_id=base_id):
       if document.getCell(base_id=base_id, *cell_coordinates) is None:
-        error_list.append(self._generateError(document,
-          self._getMessage('message_cell_inexistance'),
-          mapping=dict(line=document.getTitle())))
-        return error_list
+        return [self._generateError(
+          document, self._getMessage('message_cell_inexistance'),
+          mapping=dict(line=document.getTitle()))]
 
-    return error_list
+    return []

Added: erp5/trunk/products/ERP5/PropertySheet/TradeModelLineCellConsistencyConstraint.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/TradeModelLineCellConsistencyConstraint.py?rev=40900&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/TradeModelLineCellConsistencyConstraint.py (added)
+++ erp5/trunk/products/ERP5/PropertySheet/TradeModelLineCellConsistencyConstraint.py [utf8] Tue Nov 30 07:55:21 2010
@@ -0,0 +1,43 @@
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SARL and Contributors. All Rights Reserved.
+#                    Arnaud Fontaine <arnaud.fontaine at nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+class TradeModelLineCellConsistencyConstraint:
+    """
+    Define an Trade Model Line Cell Consistency Constraint for ZODB
+    Property Sheets
+    """
+    _properties = (
+        {   'id': 'base_id',
+            'type': 'string',
+            'description' : 'Cell base_id' },
+        {   'id': 'message_cell_inexistance',
+            'type': 'string',
+            'description' : 'Error message when there is a missing cell for '\
+                            'a given line',
+            'default': 'Missing cells on line "${line}"' },
+        )