[Erp5-report] r11244 - /erp5/trunk/products/ERP5Type/

[nobody at svn.erp5.org]

Author: aurel
Date: Fri Nov 10 12:43:08 2006
New Revision: 11244

URL: http://svn.erp5.org?rev=11244&view=rev
Log:
merge code between ConsistencyMessage and ObjectMessage class

Modified:
    erp5/trunk/products/ERP5Type/ConsistencyMessage.py
    erp5/trunk/products/ERP5Type/ObjectMessage.py

Modified: erp5/trunk/products/ERP5Type/ConsistencyMessage.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ConsistencyMessage.py?rev=11244&r1=11243&r2=11244&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ConsistencyMessage.py (original)
+++ erp5/trunk/products/ERP5Type/ConsistencyMessage.py Fri Nov 10 12:43:08 2006
@@ -27,13 +27,16 @@
 ##############################################################################
 
 from Products.PythonScripts.Utility import allow_class
+from Products.ERP5Type.ObjectMessage import ObjectMessage
 
-class ConsistencyMessage: 
+class ConsistencyMessage(ObjectMessage): 
   """
-   Object Message is used for notifications to user.
+  Consistency Message is used for notifications to user after checkConsistency.
   """
   def __init__(self, constraint, object_relative_url='', message='', mapping = {}, **kw):
-    
+    """
+    init specific variable to constraint
+    """
     self.object_relative_url = object_relative_url
     self.message = message
     self.mapping = mapping
@@ -64,14 +67,4 @@
     """
     pass
 
-  def getTranslatedMessage(self):
-    """
-    Return the message translated
-    """
-    from Products.ERP5Type.Message import Message
-    return Message(domain='erp5_ui', message=self.message, mapping=self.mapping)
-
-  getMessage = getTranslatedMessage
-                    
-
 allow_class(ConsistencyMessage)   

Modified: erp5/trunk/products/ERP5Type/ObjectMessage.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ObjectMessage.py?rev=11244&r1=11243&r2=11244&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ObjectMessage.py (original)
+++ erp5/trunk/products/ERP5Type/ObjectMessage.py Fri Nov 10 12:43:08 2006
@@ -26,19 +26,18 @@
 #
 ##############################################################################
 
-from Products.ERP5Type.Message import Message
 from Products.CMFCore.utils import getToolByName
 from Products.PythonScripts.Utility import allow_class
-from Globals import get_request
 
 class ObjectMessage: 
   """
    Object Message is used for notifications to user.
   """
-  def __init__(self, object_relative_url='', message='', **kw):
+  def __init__(self, object_relative_url='', message='', mapping={}, **kw):
     
     self.object_relative_url = object_relative_url
     self.message = message
+    self.mapping = mapping
     
     self.__dict__.update(kw)
 
@@ -46,13 +45,10 @@
     """
     Return the message translated
     """
-    return Message(domain='erp5_ui', message=self.message)
+    from Products.ERP5Type.Message import Message
+    return Message(domain='erp5_ui', message=self.message, mapping=self.mapping)
 
-  def getMessage(self):
-    """
-    Return the message without translation
-    """
-    return self.message
+  getMessage = getTranslatedMessage
                     
   def edit(self, **kw):
     """
@@ -70,6 +66,7 @@
      """
      Get the Object 
      """
+     from Globals import get_request
      request = get_request()['PARENTS']
      if request is not None:
        for item in request: