X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/884e479eef090cc3e9e5ce102bcb839a14993efe..626876f896404c5b8ed10e200d95cbedc5158f5b:/forum/views/users.py

diff --git a/forum/views/users.py b/forum/views/users.py
index cf9b373..df38159 100644
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -131,7 +131,7 @@ def online_users(request):
     })
 
 
-def edit_user(request, id):
+def edit_user(request, id, slug):
     user = get_object_or_404(User, id=id)
     if not (request.user.is_superuser or request.user == user):
         return HttpResponseUnauthorized(request)
@@ -236,7 +236,7 @@ def suspend(request, id):
             return render_to_response('users/suspend_user.html')
 
     data = {
-        'bantype': request.POST.get('bantype', 'indefinetly').strip(),
+        'bantype': request.POST.get('bantype', 'Indefinitely').strip(),
         'publicmsg': request.POST.get('publicmsg', _('Bad behaviour')),
         'privatemsg': request.POST.get('privatemsg', None) or request.POST.get('publicmsg', ''),
         'suspended': user
@@ -305,7 +305,10 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab
                 try:
                     return reverse(fn.__name__, kwargs={'id': vu.id, 'slug': slugify(smart_unicode(vu.username))})
                 except NoReverseMatch:
-                    return reverse(fn.__name__, kwargs={'id': vu.id})
+                    try:
+                        return reverse(fn.__name__, kwargs={'id': vu.id})
+                    except NoReverseMatch:
+                        return reverse(fn.__name__, kwargs={'slug': slugify(smart_unicode(vu.username))})
 
             ui.register(ui.PROFILE_TABS, ui.ProfileTab(
                 tab_name, tab_title, tab_description,url_getter, private, render_to, weight
@@ -368,7 +371,7 @@ def user_reputation(request, user, **kwargs):
     redux = lambda x, y: x+y
 
     graph_data = simplejson.dumps([
-    (time.mktime(rep[i].date.timetuple()) * 1000, reduce(redux, values[:i], 0))
+    (time.mktime(rep[i].date.timetuple()) * 1000, reduce(redux, values[:i+1], 0))
     for i in range(len(values))
     ])
 
@@ -395,7 +398,26 @@ def user_subscriptions(request, user, **kwargs):
 
     tab = request.GET.get('tab', "settings")
 
-    if tab == 'settings':
+    # Manage tab
+    if tab == 'manage':
+        manage_open = True
+
+        auto = request.GET.get('auto', 'True')
+        if auto == 'True':
+            show_auto = True
+            subscriptions = QuestionSubscription.objects.filter(user=user).order_by('-last_view')
+        else:
+            show_auto = False
+            subscriptions = QuestionSubscription.objects.filter(user=user, auto_subscription=False).order_by('-last_view')
+
+        return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), {
+            'subscriptions':subscriptions,
+            'view_user':user,
+            "auto":show_auto,
+            'manage_open':manage_open,
+        })
+    # Settings Tab and everything else
+    else:
         manage_open = False
         if request.method == 'POST':
             manage_open = False
@@ -419,34 +441,6 @@ def user_subscriptions(request, user, **kwargs):
             'manage_open':manage_open,
         }
 
-    elif tab == 'manage':
-        manage_open = True
-
-        auto = request.GET.get('auto', 'True')
-        if auto == 'True':
-            show_auto = True
-            subscriptions = QuestionSubscription.objects.filter(user=user).order_by('-last_view')
-        else:
-            show_auto = False
-            subscriptions = QuestionSubscription.objects.filter(user=user, auto_subscription=False).order_by('-last_view')
-
-        return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), {
-            'subscriptions':subscriptions,
-            'view_user':user,
-            "auto":show_auto,
-            'manage_open':manage_open,
-        })
-
-    # else:
-        # todo: probably want to throw an error
-        # error = "error to throw"
-
-
-
-
-
-
-
 @user_view('users/preferences.html', 'preferences', _('preferences'), _('preferences'), True, tabbed=False)
 def user_preferences(request, user, **kwargs):
     if request.POST: