[Erp5-report] r26496 - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: jp
Date: Sun Apr 19 14:17:51 2009
New Revision: 26496

URL: http://svn.erp5.org?rev=26496&view=rev
Log:
title_or_is not en ERP5 method. Use getTitleOrId.

Modified:
    erp5/trunk/products/ERP5/Document/Amount.py
    erp5/trunk/products/ERP5/Document/EmailDocument.py
    erp5/trunk/products/ERP5/Document/Image.py
    erp5/trunk/products/ERP5/Document/Transformation.py

Modified: erp5/trunk/products/ERP5/Document/Amount.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Amount.py?rev=26496&r1=26495&r2=26496&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Amount.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Amount.py [utf8] Sun Apr 19 14:17:51 2009
@@ -179,7 +179,7 @@
 
   security.declareProtected(Permissions.AccessContentsInformation, 
                             'getVariationBaseCategoryItemList')
-  def getVariationBaseCategoryItemList(self,display_id='title_or_id',**kw):
+  def getVariationBaseCategoryItemList(self,display_id='getTitleOrId',**kw):
     """
     Returns a list of base_category tuples.
     """
@@ -455,6 +455,7 @@
   def getNetTargetQuantity(self):
     """
       Take into account efficiency in target quantity
+      XXX - dreprecated
     """
     quantity = self.getTargetQuantity()
     efficiency = self.getTargetEfficiency()

Modified: erp5/trunk/products/ERP5/Document/EmailDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/EmailDocument.py?rev=26496&r1=26495&r2=26496&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/EmailDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/EmailDocument.py [utf8] Sun Apr 19 14:17:51 2009
@@ -322,12 +322,6 @@
       subject = ''.join(subject.split('\n'))
     return subject
   
-  def title_or_id(self):
-    """Return the title if it is not blank and the id otherwise.
-       XXX - What is this !!!! why here ???
-    """
-    return self.getTitleOrId()
-
   security.declareProtected(Permissions.AccessContentsInformation, 'getStartDate')
   def getStartDate(self, default=_MARKER):
     """

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=26496&r1=26495&r2=26496&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Sun Apr 19 14:17:51 2009
@@ -317,7 +317,7 @@
       portal_transforms = getToolByName(self, 'portal_transforms')
       result = portal_transforms.convertToData(mime_type, content,
                                                object=self, context=self,
-                                               filename=self.title_or_id(),
+                                               filename=self.getTitleOrId(),
                                                mimetype=src_mimetype)
       if result is None:
           # portal_transforms fails to convert.

Modified: erp5/trunk/products/ERP5/Document/Transformation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Transformation.py?rev=26496&r1=26495&r2=26496&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Transformation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Transformation.py [utf8] Sun Apr 19 14:17:51 2009
@@ -114,7 +114,7 @@
 
     security.declareProtected(Permissions.AccessContentsInformation, 
                               'getVariationRangeBaseCategoryItemList')
-    def getVariationRangeBaseCategoryItemList(self,display_id='title_or_id',**kw):
+    def getVariationRangeBaseCategoryItemList(self, display_id='getTitleOrId', **kw):
         """
           Returns possible variations of the transformation
           as a list of tuples (id, title). This is mostly