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

[nobody at svn.erp5.org]

Author: yo
Date: Sat Nov 14 12:23:21 2009
New Revision: 30617

URL: http://svn.erp5.org?rev=30617&view=rev
Log:
Get portal_activities from a portal.

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=30617&r1=30616&r2=30617&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActiveObject.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/ActiveObject.py [utf8] Sat Nov 14 12:23:21 2009
@@ -126,7 +126,7 @@
 
   security.declareProtected( permissions.ModifyPortalContent, 'flushActivity' )
   def flushActivity(self, invoke=0, **kw):
-    activity_tool = getToolByName(self, 'portal_activities', None)
+    activity_tool = getToolByName(self.getPortalObject(), 'portal_activities', None)
     if activity_tool is None:
       return # Do nothing if no portal_activities
     # flush all activities related to this object
@@ -146,7 +146,7 @@
   def hasActivity(self, **kw):
     """Tells if there is pending activities for this object.
     """
-    activity_tool = getToolByName(self, 'portal_activities', None)
+    activity_tool = getToolByName(self.getPortalObject(), 'portal_activities', None)
     if activity_tool is None:
       return 0 # Do nothing if no portal_activities
     return activity_tool.hasActivity(self, **kw)
@@ -165,7 +165,7 @@
 
   security.declareProtected( permissions.View, 'getActiveProcess' )
   def getActiveProcess(self):
-    activity_tool = getToolByName(self, 'portal_activities', None)
+    activity_tool = getToolByName(self.getPortalObject(), 'portal_activities', None)
     if activity_tool is None:
       return None # Do nothing if no portal_activities
     return activity_tool.getActiveProcess()

Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=30617&r1=30616&r2=30617&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] Sat Nov 14 12:23:21 2009
@@ -424,7 +424,7 @@
 
   def __call__(self, *args, **kw):
     m = Message(self.__passive_self, self.__active_process, self.__kw, self.__method_id, args, kw)
-    portal_activities = self.__passive_self.portal_activities
+    portal_activities = self.__passive_self.getPortalObject().portal_activities
     if portal_activities.activity_tracking:
       activity_tracking_logger.info('queuing message: activity=%s, object_path=%s, method_id=%s, args=%s, kw=%s, activity_kw=%s, user_name=%s' % (self.__activity, '/'.join(m.object_path), m.method_id, m.args, m.kw, m.activity_kw, m.user_name))
     activity_dict[self.__activity].queueMessage(portal_activities, m)