[Erp5-report] r11868 - in /erp5/trunk/products/ERP5Type: ./ Core/ tests/

[nobody at svn.erp5.org]

Author: jp
Date: Wed Jan  3 11:06:55 2007
New Revision: 11868

URL: http://svn.erp5.org?rev=11868&view=rev
Log:
Naming convention: SQL should be in big caps.

Modified:
    erp5/trunk/products/ERP5Type/Base.py
    erp5/trunk/products/ERP5Type/Core/Folder.py
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=11868&r1=11867&r2=11868&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Wed Jan  3 11:06:55 2007
@@ -1150,7 +1150,7 @@
     """
     return self
 
-  def asSqlExpression(self, strict_membership=0, table='category', base_category = None):
+  def asSQLExpression(self, strict_membership=0, table='category', base_category = None):
     """
       Any document can be used as a Category. It can therefore
       serve in a Predicate and must be rendered as an sql expression. This
@@ -1171,8 +1171,8 @@
     return sql_text
 
   security.declareProtected( Permissions.AccessContentsInformation,
-                             'getParentSqlExpression' )
-  def getParentSqlExpression(self, table = 'catalog', strict_membership = 0):
+                             'getParentSQLExpression' )
+  def getParentSQLExpression(self, table = 'catalog', strict_membership = 0):
     """
       Builds an SQL expression to search children and subclidren
     """
@@ -1766,6 +1766,21 @@
     """Returns the title and the id in parenthesis
     """
     return self.title_and_id()
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getTranslatedShortTitleOrId')
+  def getTranslatedShortTitleOrId(self):
+    """
+    Returns the translated title or the id if the id is empty
+    """
+    title = self.getTranslatedTitle()
+    if title is not None:
+      title = str(title)
+      if title == '' or title is None:
+        return self.getId()
+      else:
+        return title
+    return self.getId()
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getTranslatedTitleOrId')

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=11868&r1=11867&r2=11868&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Wed Jan  3 11:06:55 2007
@@ -726,18 +726,18 @@
   getObjectIds = CMFBTreeFolder.objectIds
 
   # Overloading
-  security.declareProtected( Permissions.AccessContentsInformation, 'getParentSqlExpression' )
-  def getParentSqlExpression(self, table = 'catalog', strict_membership = 0):
+  security.declareProtected( Permissions.AccessContentsInformation, 'getParentSQLExpression' )
+  def getParentSQLExpression(self, table = 'catalog', strict_membership = 0):
     """
       Builds an SQL expression to search children and subclidren
     """
     if strict_membership:
-      return Base.getParentSqlExpression(self, table=table, strict_membership=strict_membership)
+      return Base.getParentSQLExpression(self, table=table, strict_membership=strict_membership)
     result = "%s.parent_uid = %s" % (table, self.getUid())
     for o in self.objectValues():
       if hasattr(aq_base(o), 'objectValues'):
         # Do not consider non folder objects
-        result = "%s OR %s" % (result, o.getParentSqlExpression(table=table, strict_membership=strict_membership))
+        result = "%s OR %s" % (result, o.getParentSQLExpression(table=table, strict_membership=strict_membership))
     return "( %s )" % result
 
 

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=11868&r1=11867&r2=11868&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py Wed Jan  3 11:06:55 2007
@@ -399,7 +399,7 @@
     def getSimulationTool(self):
       return getToolByName(self.getPortal(), 'portal_simulation', None)
 
-    def getSqlConnection(self):
+    def getSQLConnection(self):
       return getToolByName(self.getPortal(), 'erp5_sql_connection', None)
 
     def getPortalId(self):