Django 1.3 fix.

[osqa.git] / forum / views / users.py

diff --git a/forum/views/users.py b/forum/views/users.py
index 2e665989c407bcfadf3dd89825c3b2923058fda3..e8f141c424001b96e745a3c7073ba5db8b88a121 100644 (file)
--- 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\r
 from forum.forms import *\r
 from forum.utils.html import sanitize_html\r
 from django.core.urlresolvers import reverse, NoReverseMatch\r
 from forum.forms import *\r
 from forum.utils.html import sanitize_html\r

-from forum.modules import decorate\r
+from forum.modules import decorate, ReturnImediatelyException\r

 from datetime import datetime, date\r
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction\r
 from forum.modules import ui\r
 from datetime import datetime, date\r
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction\r
 from forum.modules import ui\r


@@ -259,10 +259,10 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab
         def params(request, id, slug=None):\r
             user = get_object_or_404(User, id=id)\r
             if private and not (user == request.user or request.user.is_superuser):\r
         def params(request, id, slug=None):\r
             user = get_object_or_404(User, id=id)\r
             if private and not (user == request.user or request.user.is_superuser):\r

-                return HttpResponseUnauthorized(request)\r
+                raise ReturnImediatelyException(HttpResponseUnauthorized(request))\r

 \r
             if render_to and (not render_to(user)):\r
 \r
             if render_to and (not render_to(user)):\r

-                return HttpResponseRedirect(user.get_profile_url())\r
+                raise ReturnImediatelyException(HttpResponseRedirect(user.get_profile_url()))\r

 \r
             return [request, user], {}\r
 \r
 \r
             return [request, user], {}\r
 \r


@@ -338,7 +338,7 @@ def user_recent(request, user):
     return {"view_user" : user, "activities" : activities}\r
 \r
 \r
     return {"view_user" : user, "activities" : activities}\r
 \r
 \r

-@user_view('users/reputation.html', 'reputation', _('karma history'), _('graph of user karma'))\r
+@user_view('users/reputation.html', 'reputation', _('reputation history'), _('graph of user karma'))\r

 def user_reputation(request, user):\r
     rep = list(user.reputes.order_by('date'))\r
     values = [r.value for r in rep]\r
 def user_reputation(request, user):\r
     rep = list(user.reputes.order_by('date'))\r
     values = [r.value for r in rep]\r


@@ -368,7 +368,7 @@ def user_favorites(request, user):
 \r
 @user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False)\r
 def user_subscriptions(request, user):\r
 \r
 @user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False)\r
 def user_subscriptions(request, user):\r

-    enabled = user.subscription_settings.enable_notifications\r
+    enabled = True\r

 \r
     tab = request.GET.get('tab', "settings")\r
 \r
 \r
     tab = request.GET.get('tab', "settings")\r
 \r


@@ -382,14 +382,6 @@ def user_subscriptions(request, user):
                 form.save()\r
                 message = _('New subscription settings are now saved')\r
 \r
                 form.save()\r
                 message = _('New subscription settings are now saved')\r
 \r

-                if 'notswitch' in request.POST:\r
-                    enabled = not enabled\r
-\r
-                    if enabled:\r
-                        message = _('Notifications are now enabled')\r
-                    else:\r
-                        message = _('Notifications are now disabled')\r
-\r

                 user.subscription_settings.enable_notifications = enabled\r
                 user.subscription_settings.save()\r
 \r
                 user.subscription_settings.enable_notifications = enabled\r
                 user.subscription_settings.save()\r
 \r