Reintegrate merge cacheimp -> trunk.

[osqa.git] / forum / templatetags / user_tags.py

diff --git a/forum/templatetags/user_tags.py b/forum/templatetags/user_tags.py
index b0f2b61943cefc35c6cbcf6ed49ac567cb0eb957..2bc4385f8f0cf35379e8304d156361d8811ec97d 100644 (file)
--- a/forum/templatetags/user_tags.py
+++ b/forum/templatetags/user_tags.py
@@ -37,13 +37,16 @@ class ActivityNode(template.Node):
 \r
     def render(self, context):\r
         try:\r
-            action = self.activity.resolve(context).leaf()\r
+            action = self.activity.resolve(context).leaf\r
             viewer = self.viewer.resolve(context)\r
             describe = mark_safe(action.describe(viewer))\r
             return self.template.render(template.Context(dict(action=action, describe=describe)))\r
         except Exception, e:\r
-            #return action.action_type + ":" + str(e)\r
-            logging.error("Error in %s action describe: %s" % (action.action_type, str(e)))\r
+            import traceback\r
+            msg = "Error in action describe: \n %s" % (\r
+                traceback.format_exc()\r
+            )\r
+            logging.error(msg)\r
 \r
 @register.tag\r
 def activity_item(parser, token):\r