OSQA-706, send daily digest only to users that are active and have validated their...

[osqa.git] / forum / actions / page.py

diff --git a/forum/actions/page.py b/forum/actions/page.py
index bfeda165efa94513ebfd2cf212f2b70b5b56c4a2..508e8c250db63d7a23447cb1ea88601d3aee31a1 100644 (file)
--- a/forum/actions/page.py
+++ b/forum/actions/page.py
@@ -15,8 +15,8 @@ class NewPageAction(ActionProxy):
 
     def describe(self, viewer=None):
         return _("%(user)s created a new page titled %(page)s") % {
 
     def describe(self, viewer=None):
         return _("%(user)s created a new page titled %(page)s") % {

-            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-            'page': self.hyperlink(self.node.get_absolute_url(), self.node.title)
+        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'page': self.hyperlink(self.node.get_absolute_url(), self.node.title)

         }
 
 class EditPageAction(ActionProxy):
         }
 
 class EditPageAction(ActionProxy):


@@ -26,7 +26,7 @@ class EditPageAction(ActionProxy):
         title = data.pop('title')
         body = data.pop('content')
 
         title = data.pop('title')
         body = data.pop('content')
 

-        if (title != self.node.title) and (body != self.node.body):
+        if (title != self.node.title) or (body != self.node.body):

             self.node.create_revision(self.user, title=title, body=body)
 
         self.node.extra = data
             self.node.create_revision(self.user, title=title, body=body)
 
         self.node.extra = data


@@ -34,8 +34,8 @@ class EditPageAction(ActionProxy):
 
     def describe(self, viewer=None):
         return _("%(user)s edited the page titled %(page)s") % {
 
     def describe(self, viewer=None):
         return _("%(user)s edited the page titled %(page)s") % {

-            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-            'page': self.hyperlink(self.node.get_absolute_url(), self.node.title)
+        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'page': self.hyperlink(self.node.get_absolute_url(), self.node.title)

         }
 
 class PublishAction(ActionProxy):
         }
 
 class PublishAction(ActionProxy):


@@ -53,6 +53,6 @@ class PublishAction(ActionProxy):
 
     def describe(self, viewer=None):
         return _("%(user)s published a new page titled %(page)s") % {
 
     def describe(self, viewer=None):
         return _("%(user)s published a new page titled %(page)s") % {

-            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-            'page': self.hyperlink(self.node.get_absolute_url(), self.node.title)
+        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'page': self.hyperlink(self.node.get_absolute_url(), self.node.title)

         }
         }