Adds the option to enable/disable email digests and makes small tweak on the handling...

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

diff --git a/forum/views/users.py b/forum/views/users.py
index 67f0a90c257aa2557a3cf4f970dbc94f24c6fb55..43464d80dd5a4de035f2c107f7cdec2a3eeae562 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -7,26 +7,31 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse\r
 from django.shortcuts import render_to_response, get_object_or_404\r
 from django.template import RequestContext\r
 from django.core.urlresolvers import reverse\r
 from django.shortcuts import render_to_response, get_object_or_404\r
 from django.template import RequestContext\r

-from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect, Http404\r
+from django.http import HttpResponse, HttpResponseRedirect, Http404\r
+from forum.http_responses import HttpResponseUnauthorized\r

 from django.utils.translation import ugettext as _\r
 from django.utils.http import urlquote_plus\r
 from django.utils.html import strip_tags\r
 from django.utils import simplejson\r
 from django.utils.translation import ugettext as _\r
 from django.utils.http import urlquote_plus\r
 from django.utils.html import strip_tags\r
 from django.utils import simplejson\r

-from django.core.urlresolvers import reverse\r
+from django.core.urlresolvers import reverse, NoReverseMatch\r

 from forum.forms import *\r
 from forum.utils.html import sanitize_html\r
 from forum.forms import *\r
 from forum.utils.html import sanitize_html\r

+from forum.modules import decorate\r

 from datetime import datetime, date\r
 import decorators\r
 from datetime import datetime, date\r
 import decorators\r

-from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction\r
+from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction\r
+from forum.modules import ui\r

 \r
 import time\r
 \r
 import time\r

+import decorators\r

 \r
 USERS_PAGE_SIZE = 35# refactor - move to some constants file\r
 \r
 \r
 USERS_PAGE_SIZE = 35# refactor - move to some constants file\r
 \r

+@decorators.render('users/users.html', 'users', _('users'), weight=200)\r

 def users(request):\r
     is_paginated = True\r
     sortby = request.GET.get('sort', 'reputation')\r
 def users(request):\r
     is_paginated = True\r
     sortby = request.GET.get('sort', 'reputation')\r

-    suser = request.REQUEST.get('q',  "")\r
+    suser = request.REQUEST.get('q', "")\r

     try:\r
         page = int(request.GET.get('page', '1'))\r
     except ValueError:\r
     try:\r
         page = int(request.GET.get('page', '1'))\r
     except ValueError:\r


@@ -41,11 +46,12 @@ def users(request):
             objects_list = Paginator(User.objects.all().order_by('username'), USERS_PAGE_SIZE)\r
         # default\r
         else:\r
             objects_list = Paginator(User.objects.all().order_by('username'), USERS_PAGE_SIZE)\r
         # default\r
         else:\r

-            objects_list = Paginator(User.objects.all().order_by('-reputation'), USERS_PAGE_SIZE)\r
+            objects_list = Paginator(User.objects.all().order_by('-is_active', '-reputation'), USERS_PAGE_SIZE)\r

         base_url = reverse('users') + '?sort=%s&' % sortby\r
     else:\r
         sortby = "reputation"\r
         base_url = reverse('users') + '?sort=%s&' % sortby\r
     else:\r
         sortby = "reputation"\r

-        objects_list = Paginator(User.objects.filter(username__icontains=suser).order_by('-reputation'), USERS_PAGE_SIZE)\r
+        objects_list = Paginator(User.objects.filter(username__icontains=suser).order_by('-reputation'), USERS_PAGE_SIZE\r
+                                 )\r

         base_url = reverse('users') + '?name=%s&sort=%s&' % (suser, sortby)\r
 \r
     try:\r
         base_url = reverse('users') + '?name=%s&sort=%s&' % (suser, sortby)\r
 \r
     try:\r


@@ -53,43 +59,37 @@ def users(request):
     except (EmptyPage, InvalidPage):\r
         users = objects_list.page(objects_list.num_pages)\r
 \r
     except (EmptyPage, InvalidPage):\r
         users = objects_list.page(objects_list.num_pages)\r
 \r

-    return render_to_response('users/users.html', {\r
-                                "users" : users,\r
-                                "suser" : suser,\r
-                                "keywords" : suser,\r
-                                "tab_id" : sortby,\r
-                                "context" : {\r
-                                    'is_paginated' : is_paginated,\r
-                                    'pages': objects_list.num_pages,\r
-                                    'page': page,\r
-                                    'has_previous': users.has_previous(),\r
-                                    'has_next': users.has_next(),\r
-                                    'previous': users.previous_page_number(),\r
-                                    'next': users.next_page_number(),\r
-                                    'base_url' : base_url\r
-                                }\r
-\r
-                                }, context_instance=RequestContext(request))\r
-\r
-def set_new_email(user, new_email, nomessage=False):\r
-    if new_email != user.email:\r
-        user.email = new_email\r
-        user.email_isvalid = False\r
-        user.save()\r
-        #if settings.EMAIL_VALIDATION == 'on':\r
-        #    send_new_email_key(user,nomessage=nomessage)    \r
+    return {\r
+        "users" : users,\r
+        "suser" : suser,\r
+        "keywords" : suser,\r
+        "tab_id" : sortby,\r
+        "context" : {\r
+            'is_paginated' : is_paginated,\r
+            'pages': objects_list.num_pages,\r
+            'page': page,\r
+            'has_previous': users.has_previous(),\r
+            'has_next': users.has_next(),\r
+            'previous': users.previous_page_number(),\r
+            'next': users.next_page_number(),\r
+            'base_url' : base_url\r
+        }\r
+    }\r
+\r

 \r
 @login_required\r
 def edit_user(request, id):\r
     user = get_object_or_404(User, id=id)\r
     if not (request.user.is_superuser or request.user == user):\r
 \r
 @login_required\r
 def edit_user(request, id):\r
     user = get_object_or_404(User, id=id)\r
     if not (request.user.is_superuser or request.user == user):\r

-        return HttpResponseForbidden()\r
+        return HttpResponseUnauthorized(request)\r

     if request.method == "POST":\r
         form = EditUserForm(user, request.POST)\r
         if form.is_valid():\r
             new_email = sanitize_html(form.cleaned_data['email'])\r
 \r
     if request.method == "POST":\r
         form = EditUserForm(user, request.POST)\r
         if form.is_valid():\r
             new_email = sanitize_html(form.cleaned_data['email'])\r
 \r

-            set_new_email(user, new_email)\r
+            if new_email != user.email:\r
+                user.email = new_email\r
+                user.email_isvalid = False\r

 \r
             if settings.EDITABLE_SCREEN_NAME:\r
                 user.username = sanitize_html(form.cleaned_data['username'])\r
 \r
             if settings.EDITABLE_SCREEN_NAME:\r
                 user.username = sanitize_html(form.cleaned_data['username'])\r


@@ -104,20 +104,21 @@ def edit_user(request, id):
             user.save()\r
             EditProfileAction(user=user, ip=request.META['REMOTE_ADDR']).save()\r
 \r
             user.save()\r
             EditProfileAction(user=user, ip=request.META['REMOTE_ADDR']).save()\r
 \r

+            request.user.message_set.create(message=_("Profile updated."))\r

             return HttpResponseRedirect(user.get_profile_url())\r
     else:\r
         form = EditUserForm(user)\r
     return render_to_response('users/edit.html', {\r
             return HttpResponseRedirect(user.get_profile_url())\r
     else:\r
         form = EditUserForm(user)\r
     return render_to_response('users/edit.html', {\r

-                                                'user': user,\r
-                                                'form' : form,\r
-                                                'gravatar_faq_url' : reverse('faq') + '#gravatar',\r
-                                    }, context_instance=RequestContext(request))\r
+    'user': user,\r
+    'form' : form,\r
+    'gravatar_faq_url' : reverse('faq') + '#gravatar',\r
+    }, context_instance=RequestContext(request))\r

 \r
 \r
 @login_required\r
 def user_powers(request, id, action, status):\r
     if not request.user.is_superuser:\r
 \r
 \r
 @login_required\r
 def user_powers(request, id, action, status):\r
     if not request.user.is_superuser:\r

-        return HttpResponseForbidden()\r
+        return HttpResponseUnauthorized(request)\r

 \r
     user = get_object_or_404(User, id=id)\r
     new_state = action == 'grant'\r
 \r
     user = get_object_or_404(User, id=id)\r
     new_state = action == 'grant'\r


@@ -129,11 +130,11 @@ def user_powers(request, id, action, status):
     else:\r
         raise Http404()\r
 \r
     else:\r
         raise Http404()\r
 \r

-    user.save()    \r
+    user.save()\r

     return HttpResponseRedirect(user.get_profile_url())\r
 \r
 \r
     return HttpResponseRedirect(user.get_profile_url())\r
 \r
 \r

-@decorators.command\r
+@decorate.withfn(decorators.command)\r

 def award_points(request, id):\r
     if (not request.POST) and request.POST.get('points', None):\r
         raise decorators.CommandException(_("Invalid request type"))\r
 def award_points(request, id):\r
     if (not request.POST) and request.POST.get('points', None):\r
         raise decorators.CommandException(_("Invalid request type"))\r


@@ -146,36 +147,81 @@ def award_points(request, id):
 \r
     extra = dict(message=request.POST.get('message', ''), awarding_user=request.user.id, value=points)\r
 \r
 \r
     extra = dict(message=request.POST.get('message', ''), awarding_user=request.user.id, value=points)\r
 \r

-    BonusRepAction(user=user, extra=extra).save(data=dict(value=points))\r
+    BonusRepAction(user=request.user, extra=extra).save(data=dict(value=points, affected=user))\r

 \r
     return dict(reputation=user.reputation)\r
 \r
 \r
 \r
     return dict(reputation=user.reputation)\r
 \r
 \r

-def user_view(template, tab_name, tab_description, page_title, private=False):\r
+@decorate.withfn(decorators.command)\r
+def suspend(request, id):\r
+    user = get_object_or_404(User, id=id)\r
+\r
+    if not request.user.is_superuser:\r
+        raise decorators.CommandException(_("Only superusers can suspend other users"))\r
+\r
+    if not request.POST:\r
+        if user.is_suspended():\r
+            suspension = user.suspension\r
+            suspension.cancel(user=request.user, ip=request.META['REMOTE_ADDR'])\r
+            return decorators.RefreshPageCommand()\r
+        else:\r
+            return render_to_response('users/suspend_user.html')\r
+\r
+    data = {\r
+    'bantype': request.POST.get('bantype', 'indefinetly').strip(),\r
+    'publicmsg': request.POST.get('publicmsg', _('Bad behaviour')),\r
+    'privatemsg': request.POST.get('privatemsg', None) or request.POST.get('publicmsg', ''),\r
+    'suspended': user\r
+    }\r
+\r
+    if data['bantype'] == 'forxdays':\r
+        try:\r
+            data['forxdays'] = int(request.POST['forxdays'])\r
+        except:\r
+            raise decorators.CommandException(_('Invalid numeric argument for the number of days.'))\r
+\r
+    SuspendAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=data)\r
+\r
+    return decorators.RefreshPageCommand()\r
+\r
+\r
+def user_view(template, tab_name, tab_title, tab_description, private=False, tabbed=True, render_to=None, weight=500):\r

     def decorator(fn):\r
     def decorator(fn):\r

-        def decorated(request, id, slug=None):\r
+        def decorated(fn, 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
             user = get_object_or_404(User, id=id)\r
             if private and not (user == request.user or request.user.is_superuser):\r

-                return HttpResponseForbidden()\r
+                return HttpResponseUnauthorized(request)\r

             context = fn(request, user)\r
 \r
             context = fn(request, user)\r
 \r

-            rev_page_title = user.username + " - " + page_title\r
+            rev_page_title = user.username + " - " + tab_description\r

 \r
             context.update({\r
 \r
             context.update({\r

-                "tab_name" : tab_name,\r
-                "tab_description" : tab_description,\r
-                "page_title" : rev_page_title,\r
-                "can_view_private": (user == request.user) or request.user.is_superuser\r
+            "active_tab" : tab_name,\r
+            "tab_description" : tab_description,\r
+            "page_title" : rev_page_title,\r
+            "can_view_private": (user == request.user) or request.user.is_superuser\r

             })\r
             return render_to_response(template, context, context_instance=RequestContext(request))\r
             })\r
             return render_to_response(template, context, context_instance=RequestContext(request))\r

-        return decorated\r
+\r
+        if tabbed:\r
+            def url_getter(vu):\r
+                try:\r
+                    return reverse(fn.__name__, kwargs={'id': vu.id, 'slug': slugify(vu.username)})\r
+                except NoReverseMatch:\r
+                    return reverse(fn.__name__, kwargs={'id': vu.id})\r
+\r
+            ui.register(ui.PROFILE_TABS, ui.ProfileTab(\r
+                tab_name, tab_title, tab_description,url_getter, private, render_to, weight\r
+            ))\r
+\r
+        return decorate.withfn(decorated)(fn)\r

     return decorator\r
 \r
 \r
     return decorator\r
 \r
 \r

-@user_view('users/stats.html', 'stats', _('user profile'), _('user overview'))\r
-def user_stats(request, user):\r
-    questions = Question.objects.filter(author=user, deleted=None).order_by('-added_at')\r
-    answers = Answer.objects.filter(author=user, deleted=None).order_by('-added_at')\r
+@user_view('users/stats.html', 'stats', _('overview'), _('user overview'))\r
+def user_profile(request, user):\r
+    questions = Question.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')\r
+    answers = Answer.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')\r

 \r
     up_votes = user.vote_up_count\r
     down_votes = user.vote_down_count\r
 \r
     up_votes = user.vote_up_count\r
     down_votes = user.vote_down_count\r


@@ -186,79 +232,81 @@ def user_stats(request, user):
         .annotate(user_tag_usage_count=Count('name')).order_by('-user_tag_usage_count')\r
 \r
     awards = [(Badge.objects.get(id=b['id']), b['count']) for b in\r
         .annotate(user_tag_usage_count=Count('name')).order_by('-user_tag_usage_count')\r
 \r
     awards = [(Badge.objects.get(id=b['id']), b['count']) for b in\r

-            Badge.objects.filter(awards__user=user).values('id').annotate(count=Count('cls')).order_by('-count')]\r
+              Badge.objects.filter(awards__user=user).values('id').annotate(count=Count('cls')).order_by('-count')]\r

 \r
     return {\r
 \r
     return {\r

-            "view_user" : user,\r
-            "questions" : questions,\r
-            "answers" : answers,\r
-            "up_votes" : up_votes,\r
-            "down_votes" : down_votes,\r
-            "total_votes": up_votes + down_votes,\r
-            "votes_today_left": votes_total-votes_today,\r
-            "votes_total_per_day": votes_total,\r
-            "user_tags" : user_tags[:50],\r
-            "awards": awards,\r
-            "total_awards" : len(awards),\r
-        }\r
-\r
-@user_view('users/recent.html', 'recent', _('recent user activity'), _('recent activity'))\r
+    "view_user" : user,\r
+    "questions" : questions,\r
+    "answers" : answers,\r
+    "up_votes" : up_votes,\r
+    "down_votes" : down_votes,\r
+    "total_votes": up_votes + down_votes,\r
+    "votes_today_left": votes_total-votes_today,\r
+    "votes_total_per_day": votes_total,\r
+    "user_tags" : user_tags[:50],\r
+    "awards": awards,\r
+    "total_awards" : len(awards),\r
+    }\r
+    \r
+@user_view('users/recent.html', 'recent', _('recent activity'), _('recent user activity'))\r

 def user_recent(request, user):\r
 def user_recent(request, user):\r

-    activities = user.actions.exclude(action_type__in=("voteup", "votedown", "voteupcomment", "flag")).order_by('-action_date')[:USERS_PAGE_SIZE]\r
+    activities = user.actions.exclude(\r
+            action_type__in=("voteup", "votedown", "voteupcomment", "flag", "newpage", "editpage")).order_by(\r
+            '-action_date')[:USERS_PAGE_SIZE]\r

 \r
     return {"view_user" : user, "activities" : activities}\r
 \r
 \r
 \r
     return {"view_user" : user, "activities" : activities}\r
 \r
 \r

-@user_view('users/votes.html', 'votes', _('user vote record'), _('votes'), True)\r
-def user_votes(request, user):\r
-    votes = user.votes.filter(node__deleted=None, node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]\r
-\r
-    return {"view_user" : user, "votes" : votes}\r
-\r
-\r
-@user_view('users/reputation.html', 'reputation', _('user reputation in the community'), _('user reputation'))\r
+@user_view('users/reputation.html', 'reputation', _('karma 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

-    redux = lambda x, y: x+y     \r
+    redux = lambda x, y: x+y\r

 \r
     graph_data = simplejson.dumps([\r
 \r
     graph_data = simplejson.dumps([\r

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

     ])\r
 \r
     rep = user.reputes.filter(action__canceled=False).order_by('-date')[0:20]\r
     ])\r
 \r
     rep = user.reputes.filter(action__canceled=False).order_by('-date')[0:20]\r

-    \r
+\r

     return {"view_user": user, "reputation": rep, "graph_data": graph_data}\r
 \r
     return {"view_user": user, "reputation": rep, "graph_data": graph_data}\r
 \r

-@user_view('users/questions.html', 'favorites', _('favorite questions'),  _('favorite questions'))\r
+@user_view('users/votes.html', 'votes', _('votes'), _('user vote record'), True)\r
+def user_votes(request, user):\r
+    votes = user.votes.exclude(node__state_string__contains="(deleted").filter(\r
+            node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]\r
+\r
+    return {"view_user" : user, "votes" : votes}\r
+\r
+@user_view('users/questions.html', 'favorites', _('favorites'), _('questions that user selected as his/her favorite'))\r

 def user_favorites(request, user):\r
     favorites = FavoriteAction.objects.filter(canceled=False, user=user)\r
 \r
     return {"favorites" : favorites, "view_user" : user}\r
 \r
 def user_favorites(request, user):\r
     favorites = FavoriteAction.objects.filter(canceled=False, user=user)\r
 \r
     return {"favorites" : favorites, "view_user" : user}\r
 \r

-@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True)\r
+@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True, tabbed=False)\r

 def user_subscriptions(request, user):\r
 def user_subscriptions(request, user):\r

-    if request.method == 'POST':\r
-        form = SubscriptionSettingsForm(request.POST)\r
+    if request.method == 'POST':        \r
+        form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings)\r
+\r
+        if form.is_valid():\r
+            if form.cleaned_data['user'] != user.id:\r
+                return HttpResponseUnauthorized(request)\r

 \r
 \r

-        if 'notswitch' in request.POST:\r
-            user.subscription_settings.enable_notifications = not user.subscription_settings.enable_notifications\r
-            user.subscription_settings.save()\r
+            if 'notswitch' in request.POST:\r
+                user.subscription_settings.enable_notifications = not user.subscription_settings.enable_notifications\r
+                user.subscription_settings.save()\r

 \r
 \r

-            if user.subscription_settings.enable_notifications:\r
-                request.user.message_set.create(message=_('Notifications are now enabled'))\r
-            else:\r
-                request.user.message_set.create(message=_('Notifications are now disabled'))\r
-        else:\r
-            form.is_valid()\r
-            for k,v in form.cleaned_data.items():\r
-                setattr(user.subscription_settings, k, v)\r
+                if user.subscription_settings.enable_notifications:\r
+                    request.user.message_set.create(message=_('Notifications are now enabled'))\r
+                else:\r
+                    request.user.message_set.create(message=_('Notifications are now disabled'))\r

 \r
 \r

-            user.subscription_settings.save()\r
+            form.save()\r

             request.user.message_set.create(message=_('New subscription settings are now saved'))\r
     else:\r
             request.user.message_set.create(message=_('New subscription settings are now saved'))\r
     else:\r

-        form = SubscriptionSettingsForm(user.subscription_settings.__dict__)\r
+        form = SubscriptionSettingsForm(instance=user.subscription_settings)\r

 \r
     notificatons_on = user.subscription_settings.enable_notifications\r
 \r
 \r
     notificatons_on = user.subscription_settings.enable_notifications\r
 \r


@@ -271,7 +319,7 @@ def account_settings(request):
     is_openid = False\r
 \r
     return render_to_response('account_settings.html', {\r
     is_openid = False\r
 \r
     return render_to_response('account_settings.html', {\r

-        'msg': msg,\r
-        'is_openid': is_openid\r
-        }, context_instance=RequestContext(request))\r
+    'msg': msg,\r
+    'is_openid': is_openid\r
+    }, context_instance=RequestContext(request))\r

 \r
 \r