[Erp5-report] r39675 ivan - /erp5/trunk/products/ERP5Type/Base.py

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Oct 29 12:23:03 2010
New Revision: 39675

URL: http://svn.erp5.org?rev=39675&view=rev
Log:
Split isWebMode and isEditableMode API and make sure that they do what exactly their names states.

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

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=39675&r1=39674&r2=39675&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Base.py [utf8] Fri Oct 29 12:23:03 2010
@@ -3381,28 +3381,23 @@ class Base( CopyContainer,
   security.declarePublic('isWebMode')
   def isWebMode(self):
     """
-      return True if we are in web_mode and if editable_mode is NOT set
+      return True if we are in web mode
     """
     if self.getApplicableLayout() is None:
       return False
     if getattr(self.REQUEST, 'ignore_layout', 0):
       return False
-    if getattr(self.REQUEST, 'editable_mode', 0):
-      return False
     return True
 
   security.declarePublic('isEditableWebMode')
   def isEditableWebMode(self):
     """
-      return True if we are in web_mode and if editable_mode is set
+      return True if we are in editable mode
     """
-    if self.getApplicableLayout() is None:
-      return False
-    if getattr(self.REQUEST, 'ignore_layout', 0):
-      return False
-    if not getattr(self.REQUEST, 'editable_mode', 1):
-      return False
-    return True
+    return getattr(self.REQUEST, 'editable_mode', 0)
+    
+  isEditableMode = isEditableWebMode # for backwards compatability
+
 
   security.declareProtected(Permissions.ChangeLocalRoles,
                             'updateLocalRolesOnSecurityGroups')