X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/ecd9fa68ea62902f79744b458e4ea2ed95ce00ac..febc8df810701062ed45c129c0e30c504db28849:/forum/views/users.py

diff --git a/forum/views/users.py b/forum/views/users.py
index 7202d39..da556be 100644
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -204,7 +204,7 @@ def user_stats(request, user):
 
 @user_view('users/recent.html', 'recent', _('recent user activity'), _('recent activity'))
 def user_recent(request, user):
-    activities = user.actions.exclude(action_type__in=("voteup", "votedown", "voteupcomment", "flag")).order_by('-action_date')[:USERS_PAGE_SIZE]
+    activities = user.actions.exclude(action_type__in=("voteup", "votedown", "voteupcomment", "flag", "newpage", "editpage")).order_by('-action_date')[:USERS_PAGE_SIZE]
 
     return {"view_user" : user, "activities" : activities}
 
@@ -250,13 +250,13 @@ def user_subscriptions(request, user):
                 request.user.message_set.create(message=_('Notifications are now enabled'))
             else:
                 request.user.message_set.create(message=_('Notifications are now disabled'))
-        else:
-            form.is_valid()
-            for k,v in form.cleaned_data.items():
-                setattr(user.subscription_settings, k, v)
 
-            user.subscription_settings.save()
-            request.user.message_set.create(message=_('New subscription settings are now saved'))
+        form.is_valid()
+        for k,v in form.cleaned_data.items():
+            setattr(user.subscription_settings, k, v)
+
+        user.subscription_settings.save()
+        request.user.message_set.create(message=_('New subscription settings are now saved'))
     else:
         form = SubscriptionSettingsForm(user.subscription_settings.__dict__)