Removing the code that Hernani has removed in Revision 828 again. Somehow after the...

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

diff --git a/forum/models/node.py b/forum/models/node.py
index 0dfe1d2cea73ebe7e90ed70bb325c263900250a9..d4d0442e373996148e3a07edf756a3c7efea1e17 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -6,8 +6,9 @@ import markdown
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
-from forum.utils.userlinking import auto_user_link
 from forum.utils.html import sanitize_html
+from forum.settings import SUMMARY_LENGTH
+from forum.modules import MODULES_PACKAGE
 from utils import PickledObjectField
 
 class NodeContent(models.Model):
@@ -305,7 +306,7 @@ class Node(BaseModel, NodeContent):
 
     @property
     def summary(self):
-        return strip_tags(self.html)[:300]
+        return strip_tags(self.html)[:SUMMARY_LENGTH]
 
     @models.permalink
     def get_revisions_url(self):
@@ -338,6 +339,9 @@ class Node(BaseModel, NodeContent):
     def activate_revision(self, user, revision, extensions=['urlize']):
         self.title = revision.title
         self.tagnames = revision.tagnames
+        
+        from forum.utils.userlinking import auto_user_link
+        
         self.body = auto_user_link(self, self._as_markdown(revision.body, *extensions))
 
         self.active_revision = revision
@@ -419,8 +423,6 @@ class Node(BaseModel, NodeContent):
         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)
@@ -431,8 +433,11 @@ class Node(BaseModel, NodeContent):
 
         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)
+        
         if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))
 
     class Meta: