erp5_core: ScriptConstrant support Consistency Message side by side with strings

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.ScriptConstraint.py

@@ -27,6 +27,7 @@
 ##############################################################################
 
 from Products.ERP5Type.mixin.constraint import ConstraintMixin
+from Products.ERP5Type.ConsistencyMessage import ConsistencyMessage
 
 class ScriptConstraint(ConstraintMixin):
   """
@@ -38,7 +39,6 @@ class ScriptConstraint(ConstraintMixin):
 
   def _createConsistencyMessage(self, object_relative_url, message, mapping):
     # XXX If I put in the right place I have TypeError: 'NoneType' object is not callable
-    from Products.ERP5Type.ConsistencyMessage import ConsistencyMessage
     return ConsistencyMessage(self,
       object_relative_url=object_relative_url,
       message=message,
@@ -58,6 +58,9 @@ class ScriptConstraint(ConstraintMixin):
     createConsistencyMessage = self._createConsistencyMessage
     message_list = []
     for item in method(fixit=fixit, **kw):
+      if isinstance(item, ConsistencyMessage):
+        message_list.append(item)
+        continue
       if isinstance(item, (tuple, list)) and len(item) == 2:
         message, mapping = item
       else: