[Erp5-report] r27626 - in /erp5/trunk/products/CMFActivity: Activity/ dtml/

[nobody at svn.erp5.org]

Author: jm
Date: Wed Jun 17 10:46:33 2009
New Revision: 27626

URL: http://svn.erp5.org?rev=27626&view=rev
Log:
Display in "Activities" tab if activities are in SQLDict or SQLQueue.

Modified:
    erp5/trunk/products/CMFActivity/Activity/SQLBase.py
    erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml

Modified: erp5/trunk/products/CMFActivity/Activity/SQLBase.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLBase.py?rev=27626&r1=27625&r2=27626&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLBase.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLBase.py [utf8] Wed Jun 17 10:46:33 2009
@@ -48,12 +48,14 @@
   def getMessageList(self, activity_tool, processing_node=None,
                      include_processing=0, **kw):
     # YO: reading all lines might cause a deadlock
+    class_name = self.__class__.__name__
     readMessageList = getattr(activity_tool,
-                              self.__class__.__name__ + '_readMessageList',
+                              class_name + '_readMessageList',
                               None)
     if readMessageList is None:
       return []
     return [self.loadMessage(line.message,
+                             activity=class_name,
                              uid=line.uid,
                              processing_node=line.processing_node,
                              priority=line.priority,

Modified: erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml?rev=27626&r1=27625&r2=27626&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml [utf8] (original)
+++ erp5/trunk/products/CMFActivity/dtml/manageActivities.dtml [utf8] Wed Jun 17 10:46:33 2009
@@ -62,7 +62,9 @@
             <a href="manageInvoke?object_path=&dtml-path;&amp;method_id=&dtml-method_id;">Invoke</a>
           </td>
         </dtml-if>
-        <td align="left" valign="top"><dtml-var uid></td>
+        <td align="left" valign="top"><dtml-var uid>
+          <dtml-var expr="{'SQLDict':'(dict)','SQLQueue':'(queue)'}[activity]">
+        </td>
         <td align="left" valign="top"><a href="&dtml-path;"><dtml-var path></a></td>
         <td align="left" valign="top"><dtml-var method_id></td>
         <td align="left" valign="top">