X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/25c4f50aaedd1cb457f0dd1b9c2a4c722784629d..67d1c37bf8bb05cf1b3ebebf88b6ac5d3b5b07a2:/forum/views/users.py?ds=sidebyside

diff --git a/forum/views/users.py b/forum/views/users.py
index 2e66598..e8f141c 100644
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -15,7 +15,7 @@ from django.utils import simplejson
 from django.core.urlresolvers import reverse, NoReverseMatch
 from forum.forms import *
 from forum.utils.html import sanitize_html
-from forum.modules import decorate
+from forum.modules import decorate, ReturnImediatelyException
 from datetime import datetime, date
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction
 from forum.modules import ui
@@ -259,10 +259,10 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab
         def params(request, id, slug=None):
             user = get_object_or_404(User, id=id)
             if private and not (user == request.user or request.user.is_superuser):
-                return HttpResponseUnauthorized(request)
+                raise ReturnImediatelyException(HttpResponseUnauthorized(request))
 
             if render_to and (not render_to(user)):
-                return HttpResponseRedirect(user.get_profile_url())
+                raise ReturnImediatelyException(HttpResponseRedirect(user.get_profile_url()))
 
             return [request, user], {}
 
@@ -338,7 +338,7 @@ def user_recent(request, user):
     return {"view_user" : user, "activities" : activities}
 
 
-@user_view('users/reputation.html', 'reputation', _('karma history'), _('graph of user karma'))
+@user_view('users/reputation.html', 'reputation', _('reputation history'), _('graph of user karma'))
 def user_reputation(request, user):
     rep = list(user.reputes.order_by('date'))
     values = [r.value for r in rep]
@@ -368,7 +368,7 @@ def user_favorites(request, user):
 
 @user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False)
 def user_subscriptions(request, user):
-    enabled = user.subscription_settings.enable_notifications
+    enabled = True
 
     tab = request.GET.get('tab', "settings")
 
@@ -382,14 +382,6 @@ def user_subscriptions(request, user):
                 form.save()
                 message = _('New subscription settings are now saved')
 
-                if 'notswitch' in request.POST:
-                    enabled = not enabled
-
-                    if enabled:
-                        message = _('Notifications are now enabled')
-                    else:
-                        message = _('Notifications are now disabled')
-
                 user.subscription_settings.enable_notifications = enabled
                 user.subscription_settings.save()