Merge cacheimp -> master

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

diff --git a/forum/models/node.py b/forum/models/node.py
index a71ae4725898fbfc7dc6cddaa854590b9f248d39..afb04cf50ce91fccfbb2e0e157fb01849d890d82 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -437,6 +437,10 @@ class Node(BaseModel, NodeContent):
                 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()
 
@@ -463,7 +467,8 @@ class Node(BaseModel, NodeContent):
         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()))
+        if tags_changed:
+            self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))
 
     class Meta:
         app_label = 'forum'