Better handling for the last_activity user profile info.

[osqa.git] / forum / models / node.py

diff --git a/forum/models/node.py b/forum/models/node.py
index 75b39339e3284d74e913f60d99e80fa35a7b8d21..0f8f5d3b141e1db2ef9feeb8ba43e6ff268327b5 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -25,7 +25,13 @@ class NodeContent(models.Model):
 
     @classmethod
     def _as_markdown(cls, content, *extensions):
 
     @classmethod
     def _as_markdown(cls, content, *extensions):

-        return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions)))
+        try:
+            return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions)))
+        except Exception, e:
+            import traceback
+            logging.error("Caught exception %s in markdown parser rendering %s %s:\s %s" % (
+                str(e), cls.__name__, str(e), traceback.format_exc()))
+            return ''

 
     def as_markdown(self, *extensions):
         return self._as_markdown(self.body, *extensions)
 
     def as_markdown(self, *extensions):
         return self._as_markdown(self.body, *extensions)


@@ -106,6 +112,9 @@ class NodeQuerySet(CachedQuerySet):
         apply_bool = lambda q, b: b and q or ~q
         return self.filter(*[apply_bool(models.Q(state_string__contains="(%s)" % s), b) for s, b in kwargs.items()])
 
         apply_bool = lambda q, b: b and q or ~q
         return self.filter(*[apply_bool(models.Q(state_string__contains="(%s)" % s), b) for s, b in kwargs.items()])
 

+    def children_count(self, child_type):
+        return NodeMetaClass.types[child_type].objects.filter_state(deleted=False).filter(parent__in=self).count()
+

 
 class NodeManager(CachedManager):
     use_for_related_fields = True
 
 class NodeManager(CachedManager):
     use_for_related_fields = True


@@ -269,12 +278,15 @@ class Node(BaseModel, NodeContent):
     def get_revisions_url(self):
         return ('revisions', (), {'id': self.id})
 
     def get_revisions_url(self):
         return ('revisions', (), {'id': self.id})
 

-    def update_last_activity(self, user, save=False):
+    def update_last_activity(self, user, save=False, time=None):
+        if not time:
+            time = datetime.datetime.now()
+

         self.last_activity_by = user
         self.last_activity_by = user

-        self.last_activity_at = datetime.datetime.now()
+        self.last_activity_at = time

 
         if self.parent:
 
         if self.parent:

-            self.parent.update_last_activity(user, save=True)
+            self.parent.update_last_activity(user, save=True, time=time)

 
         if save:
             self.save()
 
         if save:
             self.save()


@@ -369,7 +381,7 @@ class Node(BaseModel, NodeContent):
             super(BaseModel, self).save(*args, **kwargs)
             self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames,
                                                          body=self.body)
             super(BaseModel, self).save(*args, **kwargs)
             self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames,
                                                          body=self.body)

-            self.update_last_activity(self.author)
+            self.update_last_activity(self.author, time=self.added_at)

 
         if self.parent_id and not self.abs_parent_id:
             self.abs_parent = self.parent.absolute_parent
 
         if self.parent_id and not self.abs_parent_id:
             self.abs_parent = self.parent.absolute_parent