Removes a few remaining usages of old django decorators and replace them by OSQA...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@555 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 049bd61c7369193b28d4ee802265d152f365cfc9..abbbc31c890d2f10b10ecad68aea0e723af91e21 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -7,7 +7,8 @@ from forum.http_responses import HttpResponseUnauthorized
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 from django.utils.http import urlquote_plus
-from django.contrib.auth.decorators import login_required
+from forum.views.decorators import login_required
+from forum.modules import decorate
 from django.contrib.auth import login, logout
 from django.http import get_host
 from forum.actions import SuspendAction
@@ -290,7 +291,6 @@ def validate_email(request, user, code):
     else:
         raise Http404()
 
-@login_required
 def auth_settings(request, id):
     user_ = get_object_or_404(User, id=id)
 
@@ -402,7 +402,7 @@ def forward_suspended_user(request, user, show_private_msg=True):
     request.user.message_set.create(message)
     return HttpResponseRedirect(reverse('index'))
 
-@login_required
+@decorate.withfn(login_required)
 def signout(request):
     logout(request)
     return HttpResponseRedirect(reverse('index'))
\ No newline at end of file

diff --git a/forum/views/commands.py b/forum/views/commands.py
index 04360475ffb7dad550c1d4e012a073857aed40f5..ad6d773b7c529d94e397c13749026f133df6983c 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -10,7 +10,6 @@ from forum.models import *
 from forum.models.node import NodeMetaClass
 from forum.actions import *
 from django.core.urlresolvers import reverse
-from django.contrib.auth.decorators import login_required
 from forum.utils.decorators import ajax_method, ajax_login_required
 from decorators import command, CommandException, RefreshPageCommand
 from forum.modules import decorate

diff --git a/forum/views/decorators.py b/forum/views/decorators.py
index 758b6876294907998de3fec82cee22fabfef30b0..f72703b906cfb030da76559b2a9ce66ffd0910a1 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -8,6 +8,12 @@ from django.utils.translation import ungettext, ugettext as _
 from forum.modules import ui, decorate\r
 import logging\r
 \r
+def login_required(func, request, *args, **kwargs):\r
+    if not request.user.is_authenticated():\r
+        return HttpResponseRedirect(reverse('auth_signin'))\r
+    else:\r
+        return func(request, *args, **kwargs)\r
+\r
 def render(template=None, tab=None, tab_title='', weight=500, tabbed=True):\r
     def decorator(func):        \r
         def decorated(context, request, *args, **kwargs):\r

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 3330a3b641120295baa5387724e1343ca3cf3e47..2177301d48b3bf723a254815aef85106a08484d0 100644 (file)
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -6,6 +6,8 @@ from django.template import RequestContext, loader
 from django.http import HttpResponseRedirect, HttpResponse, Http404
 from django.views.static import serve
 from forum import settings
+from forum.modules import decorate
+from forum.views.decorators import login_required
 from forum.forms import FeedbackForm
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
@@ -70,6 +72,7 @@ feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, giv
 def privacy(request):
     return render_to_response('privacy.html', context_instance=RequestContext(request))
 
+@decorate.withfn(login_required)
 def logout(request):
     return render_to_response('logout.html', {
     'next' : get_next_url(request),

diff --git a/forum/views/users.py b/forum/views/users.py
index 3c1654cf82d3478d485fcd6ecf42bafc648847a2..d95b3027259624e2ff4d95560d3aaea95f1358a0 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -1,4 +1,3 @@
-from django.contrib.auth.decorators import login_required\r
 from forum.models import User\r
 from django.db.models import Q, Count\r
 from django.core.paginator import Paginator, EmptyPage, InvalidPage\r
@@ -83,7 +82,6 @@ def online_users(request):
     })\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
@@ -403,13 +401,4 @@ def user_preferences(request, user):
             \r
     return {'view_user': user, 'form': form}\r
 \r
-@login_required\r
-def account_settings(request):\r
-    logging.debug('')\r
-    msg = request.GET.get('msg', '')\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

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 74708d651b685dd310350f0042423fae10c63c0f..07364f7647da985ff2c8547316504abcf9a7af7f 100644 (file)
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -4,7 +4,6 @@ import time, datetime, random
 import logging
 from django.core.files.storage import FileSystemStorage
 from django.shortcuts import render_to_response, get_object_or_404
-from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect, HttpResponse, Http404
 from django.template import RequestContext
 from django.utils.html import *
@@ -110,7 +109,6 @@ def ask(request):
         'form' : form,
         }, context_instance=RequestContext(request))
 
-@login_required
 def edit_question(request, id):
     question = get_object_or_404(Question, id=id)
     if question.nis.deleted and not request.user.can_view_deleted_post(question):
@@ -174,7 +172,6 @@ def _edit_question(request, question):
         #'tags' : _get_tags_cache_json()
     }, context_instance=RequestContext(request))
 
-@login_required
 def edit_answer(request, id):
     answer = get_object_or_404(Answer, id=id)
     if answer.deleted and not request.user.can_view_deleted_post(answer):