use latest jQuery version

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

diff --git a/forum/views/users.py b/forum/views/users.py
index 82e817560cfbc9b3b053b847752c7394e1e8399e..db65003c7130c1f51571e84bd746dd4492715ab4 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -131,7 +131,7 @@ def online_users(request):
     })\r
 \r
 \r
     })\r
 \r
 \r

-def edit_user(request, id):\r
+def edit_user(request, id, slug):\r

     user = get_object_or_404(User, id=id)\r
     if not (request.user.is_superuser or request.user == user):\r
         return HttpResponseUnauthorized(request)\r
     user = get_object_or_404(User, id=id)\r
     if not (request.user.is_superuser or request.user == user):\r
         return HttpResponseUnauthorized(request)\r


@@ -371,7 +371,7 @@ def user_reputation(request, user, **kwargs):
     redux = lambda x, y: x+y\r
 \r
     graph_data = simplejson.dumps([\r
     redux = lambda x, y: x+y\r
 \r
     graph_data = simplejson.dumps([\r

-    (time.mktime(rep[i].date.timetuple()) * 1000, reduce(redux, values[:i], 0))\r
+    (time.mktime(rep[i].date.timetuple()) * 1000, reduce(redux, values[:i+1], 0))\r

     for i in range(len(values))\r
     ])\r
 \r
     for i in range(len(values))\r
     ])\r
 \r


@@ -398,7 +398,26 @@ def user_subscriptions(request, user, **kwargs):
 \r
     tab = request.GET.get('tab', "settings")\r
 \r
 \r
     tab = request.GET.get('tab', "settings")\r
 \r

-    if tab == 'settings':\r
+    # Manage tab\r
+    if tab == 'manage':\r
+        manage_open = True\r
+\r
+        auto = request.GET.get('auto', 'True')\r
+        if auto == 'True':\r
+            show_auto = True\r
+            subscriptions = QuestionSubscription.objects.filter(user=user).order_by('-last_view')\r
+        else:\r
+            show_auto = False\r
+            subscriptions = QuestionSubscription.objects.filter(user=user, auto_subscription=False).order_by('-last_view')\r
+\r
+        return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), {\r
+            'subscriptions':subscriptions,\r
+            'view_user':user,\r
+            "auto":show_auto,\r
+            'manage_open':manage_open,\r
+        })\r
+    # Settings Tab and everything else\r
+    else:\r

         manage_open = False\r
         if request.method == 'POST':\r
             manage_open = False\r
         manage_open = False\r
         if request.method == 'POST':\r
             manage_open = False\r


@@ -422,34 +441,6 @@ def user_subscriptions(request, user, **kwargs):
             'manage_open':manage_open,\r
         }\r
 \r
             'manage_open':manage_open,\r
         }\r
 \r

-    elif tab == 'manage':\r
-        manage_open = True\r
-\r
-        auto = request.GET.get('auto', 'True')\r
-        if auto == 'True':\r
-            show_auto = True\r
-            subscriptions = QuestionSubscription.objects.filter(user=user).order_by('-last_view')\r
-        else:\r
-            show_auto = False\r
-            subscriptions = QuestionSubscription.objects.filter(user=user, auto_subscription=False).order_by('-last_view')\r
-\r
-        return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), {\r
-            'subscriptions':subscriptions,\r
-            'view_user':user,\r
-            "auto":show_auto,\r
-            'manage_open':manage_open,\r
-        })\r
-\r
-    # else:\r
-        # todo: probably want to throw an error\r
-        # error = "error to throw"\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r

 @user_view('users/preferences.html', 'preferences', _('preferences'), _('preferences'), True, tabbed=False)\r
 def user_preferences(request, user, **kwargs):\r
     if request.POST:\r
 @user_view('users/preferences.html', 'preferences', _('preferences'), _('preferences'), True, tabbed=False)\r
 def user_preferences(request, user, **kwargs):\r
     if request.POST:\r