a new setting has been added that allows to choose whether to update the latest activ...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1083 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/models/node.py b/forum/models/node.py
index 96b41dcd054af541519873fdb0925562390a6d7b..72ef0c0737c12efa2a1b04abaa4fc18dd24660cc 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -359,7 +359,22 @@ class Node(BaseModel, NodeContent):
         self.body = self.rendered(revision.body)
 
         self.active_revision = revision
-        self.update_last_activity(user)
+
+        # Try getting the previous revision
+        try:
+            prev_revision = NodeRevision.objects.get(node=self, revision=revision.revision-1)
+
+            update_activity = True
+
+            # Do not update the activity if only the tags are changed
+            if prev_revision.title == revision.title and prev_revision.body == revision.body \
+            and prev_revision.tagnames != revision.tagnames and not settings.UPDATE_LATEST_ACTIVITY_ON_TAG_EDIT:
+                update_activity = False
+        except NodeRevision.DoesNotExist:
+            update_activity = True
+        finally:
+            if update_activity:
+                self.update_last_activity(user)
 
         self.save()
 

diff --git a/forum/settings/view.py b/forum/settings/view.py
index fa6edf3d62dd3ba91722e81360bb79dd113df780..5ebd228f584e56c5691a00d86e60553a147b4776 100644 (file)
--- a/forum/settings/view.py
+++ b/forum/settings/view.py
@@ -16,6 +16,10 @@ RECENT_AWARD_SIZE = Setting('RECENT_AWARD_SIZE', 15, VIEW_SET, dict(
 label = _("Recent awards block size"),
 help_text = _("The number of awards to display in the recent awards block in the front page.")))
 
+UPDATE_LATEST_ACTIVITY_ON_TAG_EDIT = Setting('UPDATE_LATEST_ACTIVITY_ON_TAG_EDIT', True, VIEW_SET, dict(
+label = _("Update latest activity on tag edit"), required=False,
+help_text = _("If you check this the latest activity will be updated when editing only the tags of a question.")))
+
 LIMIT_RELATED_TAGS = Setting('LIMIT_RELATED_TAGS', 0, VIEW_SET, dict(
 label = _("Limit related tags block"),
-help_text = _("Limit related tags block size in questions list pages. Set to 0 to display all all tags.")))
\ No newline at end of file
+help_text = _("Limit related tags block size in questions list pages. Set to 0 to display all all tags.")))