]> git.openstreetmap.org Git - osqa.git/blobdiff - forum/views/users.py
Adds the option to enable/disable email digests and makes small tweak on the handling...
[osqa.git] / forum / views / users.py
index 9978255dfe4c2ab0574d763d285c7dadb04cbaf9..43464d80dd5a4de035f2c107f7cdec2a3eeae562 100644 (file)
@@ -13,17 +13,21 @@ from django.utils.translation import ugettext as _
 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.modules import decorate\r
 from datetime import datetime, date\r
 import decorators\r
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction\r
+from forum.modules import ui\r
 \r
 import time\r
+import decorators\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
@@ -55,31 +59,23 @@ def users(request):
     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
+    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
-    }, 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
 \r
 @login_required\r
 def edit_user(request, id):\r
@@ -91,7 +87,9 @@ def edit_user(request, id):
         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
@@ -106,6 +104,7 @@ def edit_user(request, id):
             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
@@ -135,7 +134,7 @@ def user_powers(request, id, action, status):
     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
@@ -148,31 +147,31 @@ def award_points(request, id):
 \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
-@decorators.command\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(ip=request.META['REMOTE_ADDR'])\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
-    if not request.user.is_superuser:\r
-        raise decorators.CommandException(_("Only superusers can ban other users"))\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
-    'suspender': request.user.id\r
+    'suspended': user\r
     }\r
 \r
     if data['bantype'] == 'forxdays':\r
@@ -181,35 +180,46 @@ def suspend(request, id):
         except:\r
             raise decorators.CommandException(_('Invalid numeric argument for the number of days.'))\r
 \r
-    SuspendAction(user=user, ip=request.META['REMOTE_ADDR']).save(data=data)\r
+    SuspendAction(user=request.user, ip=request.META['REMOTE_ADDR']).save(data=data)\r
 \r
     return decorators.RefreshPageCommand()\r
 \r
-def user_view(template, tab_name, tab_description, page_title, private=False):\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 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
                 return HttpResponseUnauthorized(request)\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
-            "tab_name" : tab_name,\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 decorated\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
-@user_view('users/stats.html', 'stats', _('user profile'), _('user overview'))\r
-def user_stats(request, user):\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
@@ -237,8 +247,8 @@ def user_stats(request, user):
     "awards": awards,\r
     "total_awards" : len(awards),\r
     }\r
-\r
-@user_view('users/recent.html', 'recent', _('recent user activity'), _('recent activity'))\r
+    \r
+@user_view('users/recent.html', 'recent', _('recent activity'), _('recent user activity'))\r
 def user_recent(request, user):\r
     activities = user.actions.exclude(\r
             action_type__in=("voteup", "votedown", "voteupcomment", "flag", "newpage", "editpage")).order_by(\r
@@ -247,15 +257,7 @@ def user_recent(request, user):
     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.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
-\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
@@ -270,34 +272,41 @@ def user_reputation(request, user):
 \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
-@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
-    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 'notswitch' in request.POST:\r
-            user.subscription_settings.enable_notifications = not user.subscription_settings.enable_notifications\r
-            user.subscription_settings.save()\r
+        if form.is_valid():\r
+            if form.cleaned_data['user'] != user.id:\r
+                return HttpResponseUnauthorized(request)\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
+            if 'notswitch' in request.POST:\r
+                user.subscription_settings.enable_notifications = not user.subscription_settings.enable_notifications\r
+                user.subscription_settings.save()\r
 \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
-        user.subscription_settings.save()\r
-        request.user.message_set.create(message=_('New subscription settings are now saved'))\r
+            form.save()\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