X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/617e60be3c7d2e0f17639f3487a721d4efdc02c0..60cf509da831a2e81e2631ffc1150f81ed96fe4c:/forum/views/users.py?ds=sidebyside diff --git a/forum/views/users.py b/forum/views/users.py index dee69cd..ba9e173 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -16,6 +16,7 @@ from django.utils import simplejson from django.core.urlresolvers import reverse, NoReverseMatch from forum.forms import * from forum.utils.html import sanitize_html +from forum.modules import decorate from datetime import datetime, date import decorators from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction @@ -133,7 +134,7 @@ def user_powers(request, id, action, status): return HttpResponseRedirect(user.get_profile_url()) -@decorators.command +@decorate.withfn(decorators.command) def award_points(request, id): if (not request.POST) and request.POST.get('points', None): raise decorators.CommandException(_("Invalid request type")) @@ -151,7 +152,7 @@ def award_points(request, id): return dict(reputation=user.reputation) -@decorators.command +@decorate.withfn(decorators.command) def suspend(request, id): user = get_object_or_404(User, id=id) @@ -185,7 +186,7 @@ def suspend(request, id): def user_view(template, tab_name, tab_title, tab_description, private=False, tabbed=True, weight=500): def decorator(fn): - def decorated(request, id, slug=None): + def decorated(fn, request, id, slug=None): user = get_object_or_404(User, id=id) if private and not (user == request.user or request.user.is_superuser): return HttpResponseUnauthorized(request) @@ -212,8 +213,7 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab tab_name, tab_title, tab_description,url_getter, private, weight )) - return decorated - + return decorate.withfn(decorated)(fn) return decorator @@ -246,7 +246,7 @@ def user_profile(request, user): "awards": awards, "total_awards" : len(awards), } - + @user_view('users/recent.html', 'recent', _('recent activity'), _('recent user activity')) def user_recent(request, user): activities = user.actions.exclude(