OSQA-178, we notify the current user with a message after a node has been deleted...

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

diff --git a/forum/models/node.py b/forum/models/node.py
index 6a181659956e735158ccffd257c799841668852e..553b6c26188f9f36b173dc4b5cfb6a8db5e59407 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -7,6 +7,7 @@ from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
 from forum.utils.html import sanitize_html
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
 from forum.utils.html import sanitize_html

+from forum.settings import SUMMARY_LENGTH

 from utils import PickledObjectField
 
 class NodeContent(models.Model):
 from utils import PickledObjectField
 
 class NodeContent(models.Model):


@@ -143,10 +144,11 @@ class NodeManager(CachedManager):
     def get_query_set(self):
         qs = NodeQuerySet(self.model)
 
     def get_query_set(self):
         qs = NodeQuerySet(self.model)
 

+        # If the node is an answer, question or comment we filter the Node model by type

         if self.model is not Node:
         if self.model is not Node:

-            return qs.filter(node_type=self.model.get_type())
-        else:
-            return qs
+            qs = qs.filter(node_type=self.model.get_type())
+
+        return qs

 
     def get_for_types(self, types, *args, **kwargs):
         kwargs['node_type__in'] = [t.get_type() for t in types]
 
     def get_for_types(self, types, *args, **kwargs):
         kwargs['node_type__in'] = [t.get_type() for t in types]


@@ -304,7 +306,7 @@ class Node(BaseModel, NodeContent):
 
     @property
     def summary(self):
 
     @property
     def summary(self):

-        return strip_tags(self.html)[:300]
+        return strip_tags(self.html)[:SUMMARY_LENGTH]

 
     @models.permalink
     def get_revisions_url(self):
 
     @models.permalink
     def get_revisions_url(self):


@@ -331,13 +333,16 @@ class Node(BaseModel, NodeContent):
     def create_revision(self, user, **kwargs):
         number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1
         revision = self._create_revision(user, number, **kwargs)
     def create_revision(self, user, **kwargs):
         number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1
         revision = self._create_revision(user, number, **kwargs)

-        self.activate_revision(user, revision)
+        self.activate_revision(user, revision, extensions=['urlize'])

         return revision
 
         return revision
 

-    def activate_revision(self, user, revision, *extensions):
+    def activate_revision(self, user, revision, extensions=['urlize']):

         self.title = revision.title
         self.tagnames = revision.tagnames
         self.title = revision.title
         self.tagnames = revision.tagnames

-        self.body = self._as_markdown(revision.body, *extensions)
+        
+        from forum.utils.userlinking import auto_user_link
+        
+        self.body = auto_user_link(self, self._as_markdown(revision.body, *extensions))

 
         self.active_revision = revision
         self.update_last_activity(user)
 
         self.active_revision = revision
         self.update_last_activity(user)


@@ -418,8 +423,6 @@ class Node(BaseModel, NodeContent):
         super(Node, self).delete(*args, **kwargs)
 
     def save(self, *args, **kwargs):
         super(Node, self).delete(*args, **kwargs)
 
     def save(self, *args, **kwargs):

-        tags_changed = self._process_changes_in_tags()
-

         if not self.id:
             self.node_type = self.get_type()
             super(BaseModel, self).save(*args, **kwargs)
         if not self.id:
             self.node_type = self.get_type()
             super(BaseModel, self).save(*args, **kwargs)


@@ -430,8 +433,11 @@ class Node(BaseModel, NodeContent):
 
         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

-
+        
+        tags_changed = self._process_changes_in_tags()
+        

         super(Node, self).save(*args, **kwargs)
         super(Node, self).save(*args, **kwargs)

+        

         if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))
 
     class Meta:
         if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))
 
     class Meta: