[Erp5-report] r9203 - in /erp5/trunk/products/ERP5Type: Base.py TranslationProviderBase.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Aug 14 18:08:38 2006
New Revision: 9203

URL: http://svn.erp5.org?rev=9203&view=rev
Log:
fix some security definitions and parameter names to zLOG.LOG

Modified:
    erp5/trunk/products/ERP5Type/Base.py
    erp5/trunk/products/ERP5Type/TranslationProviderBase.py

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=9203&r1=9202&r2=9203&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Mon Aug 14 18:08:38 2006
@@ -1091,7 +1091,8 @@
           (table, self.getUid(), table, base_category.getBaseCategoryUid())
     return sql_text
 
-  security.declareProtected( Permissions.AccessContentsInformation, 'asParentSqlExpression' )
+  security.declareProtected( Permissions.AccessContentsInformation,
+                             'getParentSqlExpression' )
   def getParentSqlExpression(self, table = 'catalog', strict_membership = 0):
     """
       Builds an SQL expression to search children and subclidren
@@ -1832,7 +1833,8 @@
     portal_workflow = self.portal_workflow
     return portal_workflow.getInfoFor(self, name, wf_id=wf_id)
 
-  security.declareProtected(Permissions.ManagePortal, 'View')
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'objectCount')
   def objectCount(self):
     """
       Returns number of objects
@@ -2124,13 +2126,9 @@
   def _temp_getTitle(self):
     return getattr(self,'title',None)
 
-  def log(self, description, content):
-    """
-    Put a log message
-    """
-    LOG(description,0,content)
-
-  security.declareProtected(Permissions.ModifyPortalContent,'setDescription')
+  def log(self, subsystem, message, level=INFO):
+    """Put a log message """
+    LOG(subsystem, level, message)
 
   # Dublin Core Emulation for CMF interoperatibility
   # CMF Dublin Core Compatibility

Modified: erp5/trunk/products/ERP5Type/TranslationProviderBase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/TranslationProviderBase.py?rev=9203&r1=9202&r2=9203&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/TranslationProviderBase.py (original)
+++ erp5/trunk/products/ERP5Type/TranslationProviderBase.py Mon Aug 14 18:08:38 2006
@@ -77,7 +77,7 @@
         if type(ps_property) in (type(()), type([])):
           current_list += ps_property
     # create TranslationInformation object for each property
-    for prop in current_list:      
+    for prop in current_list:
       if prop.get('translatable', 0):
         prop_id = prop['id']
         if not property_domain_dict.has_key(prop_id):
@@ -92,7 +92,7 @@
     """
     property_domain_dict = getattr(aq_base(self), '_property_domain_dict', {})
     if len(property_domain_dict) == 0:
-      self.createInitialPropertyTranslationDomainDict()      
+      self.createInitialPropertyTranslationDomainDict()
     return self._property_domain_dict
 
   #
@@ -108,10 +108,10 @@
     keys.sort()
     for k in keys:
       prop = prop_domain_name_dict[k]
-      t = {}      
+      t = {}
       t['property_name'] = prop.getPropertyName()
       t['domain_name'] = prop.getDomainName()
-      translation_list.append(t)      
+      translation_list.append(t)
 
     # get list of Localizer catalog, add 'empty' one for no traduction
     catalog = self.getPortalObject().Localizer.objectIds() + ['']
@@ -125,7 +125,7 @@
                                    )
   
 
-  security.declareProtected( ManagePortal, 'changeRoles' )
+  security.declareProtected( ManagePortal, 'changeTranslations' )
   def changeTranslations( self, properties=None, REQUEST=None ):
     """
     Update our list of translations domain name