resolves an issue with tags used count that can get out of control if called from...

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

diff --git a/forum/models/node.py b/forum/models/node.py
index 6694426a478b3738198c8f1adfca8de7b487e820..e8d6334751cab1a31498c76eb377b0d528c3d89b 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from base import *
+import logging
 import re
 from tag import Tag
 
@@ -317,16 +318,27 @@ class Node(BaseModel, NodeContent):
 
     @property
     def summary(self):
-        content = strip_tags(self.html)[:SUMMARY_LENGTH]
+        content = strip_tags(self.html)
 
         # Remove multiple spaces.
         content = re.sub(' +',' ', content)
 
-        # Remove line breaks. We don't need them at all.
-        content = content.replace("\n", '')
+        # Replace line breaks with a space, we don't need them at all.
+        content = content.replace("\n", ' ')
+
+        # Truncate and all an ellipsis if length greater than summary length.
+        content = (content[:SUMMARY_LENGTH] + '...') if len(content) > SUMMARY_LENGTH else content
 
         return content
 
+    # Can be used to block subscription notifications for a specific node from a module
+    def _is_notifiable(self):
+        return True
+
+    @property
+    def is_notifiable(self):
+        return self._is_notifiable()
+
     @models.permalink
     def get_revisions_url(self):
         return ('revisions', (), {'id': self.id})
@@ -438,15 +450,13 @@ class Node(BaseModel, NodeContent):
 
                 if not self.nis.deleted:
                     tag.add_to_usage_count(1)
-                    tag.save()
 
             if not self.nis.deleted:
                 for name in tag_changes['removed']:
                     try:
                         tag = Tag.objects.get(name=name)
                         tag.add_to_usage_count(-1)
-                        tag.save()
-                    except:
+                    except Tag.DoesNotExist:
                         pass
 
             return True
@@ -460,16 +470,13 @@ class Node(BaseModel, NodeContent):
         if action:
             for tag in self.tags.all():
                 tag.add_to_usage_count(-1)
-                tag.save()
         else:
             for tag in Tag.objects.filter(name__in=self.tagname_list()):
                 tag.add_to_usage_count(1)
-                tag.save()
 
     def delete(self, *args, **kwargs):
         for tag in self.tags.all():
             tag.add_to_usage_count(-1)
-            tag.save()
 
         self.active_revision = None
         self.save()