[Erp5-report] r12664 - in /erp5/trunk/products/CMFActivity: ActiveObject.py ActivityTool.py

[nobody at svn.erp5.org]

Author: alex
Date: Tue Feb 13 15:57:44 2007
New Revision: 12664

URL: http://svn.erp5.org?rev=12664&view=rev
Log:
Renamed ActivityTool.activate to activateObject to prevent conflict with
ActiveObject.activate. Also added a security declaration to prevent the mehtod
from being called by a python script.

Modified:
    erp5/trunk/products/CMFActivity/ActiveObject.py
    erp5/trunk/products/CMFActivity/ActivityTool.py

Modified: erp5/trunk/products/CMFActivity/ActiveObject.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActiveObject.py?rev=12664&r1=12663&r2=12664&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActiveObject.py (original)
+++ erp5/trunk/products/CMFActivity/ActiveObject.py Tue Feb 13 15:57:44 2007
@@ -111,7 +111,7 @@
     # a queue can be provided as well as extra parameters
     # which can be used for example to define deferred tasks
     try:
-      return activity_tool.activate(self, activity, active_process, **kw)
+      return activity_tool.activateObject(self, activity, active_process, **kw)
     except ConflictError:
       raise
     except:

Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=12664&r1=12663&r2=12664&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py Tue Feb 13 15:57:44 2007
@@ -613,7 +613,8 @@
           return 1
       return 0
 
-    def activate(self, object, activity, active_process, **kw):
+    security.declarePrivate('activateObject')
+    def activateObject(self, object, activity, active_process, **kw):
       global is_initialized
       if not is_initialized: self.initialize()
       if getattr(self, '_v_activity_buffer', None) is None: