X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1d02164e7c7c23bb6194d73aeddd215f0e638293..c917b62b3f5772efe422bea6bad19af33b1528f6:/forum/views/users.py

diff --git a/forum/views/users.py b/forum/views/users.py
index 0f1c372..6bc3477 100644
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -15,9 +15,9 @@ from django.utils import simplejson
 from django.core.urlresolvers import reverse
 from forum.forms import *
 from forum.utils.html import sanitize_html
-from datetime import date
+from datetime import datetime, date
 import decorators
-from forum.actions import EditProfileAction, FavoriteAction
+from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction
 
 import time
 
@@ -96,9 +96,9 @@ def edit_user(request, id):
             user.real_name = sanitize_html(form.cleaned_data['realname'])
             user.website = sanitize_html(form.cleaned_data['website'])
             user.location = sanitize_html(form.cleaned_data['city'])
-            user.date_of_birth = sanitize_html(form.cleaned_data['birthday'])
+            user.date_of_birth = form.cleaned_data['birthday']
             if user.date_of_birth == "None":
-                user.date_of_birth = '1900-01-01'
+                user.date_of_birth = datetime(1900, 1, 1, 0, 0)
             user.about = sanitize_html(form.cleaned_data['about'])
 
             user.save()
@@ -114,6 +114,42 @@ def edit_user(request, id):
                                     }, context_instance=RequestContext(request))
 
 
+@login_required
+def user_powers(request, id, action, status):
+    if not request.user.is_superuser:
+        return HttpResponseForbidden()
+
+    user = get_object_or_404(User, id=id)
+    new_state = action == 'grant'
+
+    if status == 'super':
+        user.is_superuser = new_state
+    elif status == 'staff':
+        user.is_staff = new_state
+    else:
+        raise Http404()
+
+    user.save()    
+    return HttpResponseRedirect(user.get_profile_url())
+
+
+@decorators.command
+def award_points(request, id):
+    if (not request.POST) and request.POST.get('points', None):
+        raise decorators.CommandException(_("Invalid request type"))
+
+    if not request.user.is_superuser:
+        raise decorators.CommandException(_("Only superusers are allowed to award reputation points"))
+
+    user = get_object_or_404(User, id=id)
+    points = int(request.POST['points'])
+
+    extra = dict(message=request.POST.get('message', ''), awarding_user=request.user.id, value=points)
+
+    BonusRepAction(user=user, extra=extra).save(data=dict(value=points))
+
+    return dict(reputation=user.reputation)
+
 
 def user_view(template, tab_name, tab_description, page_title, private=False):
     def decorator(fn):
@@ -138,8 +174,8 @@ def user_view(template, tab_name, tab_description, page_title, private=False):
 
 @user_view('users/stats.html', 'stats', _('user profile'), _('user overview'))
 def user_stats(request, user):
-    questions = Question.objects.filter(author=user, deleted=None).order_by('-added_at')
-    answers = Answer.objects.filter(author=user, deleted=None).order_by('-added_at')
+    questions = Question.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')
+    answers = Answer.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')
 
     up_votes = user.vote_up_count
     down_votes = user.vote_down_count
@@ -175,7 +211,7 @@ def user_recent(request, user):
 
 @user_view('users/votes.html', 'votes', _('user vote record'), _('votes'), True)
 def user_votes(request, user):
-    votes = user.votes.filter(node__deleted=None, node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]
+    votes = user.votes.exclude(node__state_string__contains="(deleted").filter(node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]
 
     return {"view_user" : user, "votes" : votes}
 
@@ -191,11 +227,13 @@ def user_reputation(request, user):
             for i in range(len(values))
     ])
 
-    return {"view_user": user, "reputation": reversed(rep), "graph_data": graph_data}
+    rep = user.reputes.filter(action__canceled=False).order_by('-date')[0:20]
+    
+    return {"view_user": user, "reputation": rep, "graph_data": graph_data}
 
 @user_view('users/questions.html', 'favorites', _('favorite questions'),  _('favorite questions'))
 def user_favorites(request, user):
-    favorites = FavoriteAction.objects.filter(user=user)
+    favorites = FavoriteAction.objects.filter(canceled=False, user=user)
 
     return {"favorites" : favorites, "view_user" : user}
 
@@ -212,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__)