From 9f15842e14e1fe3c08378171376c312d3e014f40 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Fri, 8 Feb 2008 22:44:50 +0100 Subject: [PATCH] * Add wrappers around the generic views, so we can add the @login_required decorator. --- influences/views.py | 13 +++++++++++++ urls.py | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/influences/views.py b/influences/views.py index 6c48653..341c9a3 100644 --- a/influences/views.py +++ b/influences/views.py @@ -6,6 +6,7 @@ from django.utils.translation import ugettext as _ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect +from django.views.generic.list_detail import object_detail, object_list from ee.influences.models import Character from ee.influences.models import Influence from ee.tools.forms import ContextModelForm @@ -59,3 +60,15 @@ def index(request): characters = request.user.character_set.all() influences = Influence.objects.filter(character__in=characters) return render_to_response('influences/index.html', {'characters' : characters, 'influences' : influences}, RequestContext(request)) + +@login_required +def character_list(*args, **kwargs): + return object_list(*args, **kwargs) + +@login_required +def character_detail(*args, **kwargs): + return object_detail(*args, **kwargs) + +@login_required +def influence_detail(*args, **kwargs): + return object_detail(*args, **kwargs) diff --git a/urls.py b/urls.py index 086f58a..652b7a9 100644 --- a/urls.py +++ b/urls.py @@ -21,10 +21,10 @@ urlpatterns = patterns('', url(r'^influences/$', 'ee.influences.views.index', name='influences_index'), url(r'^influences/influence/add/(\d+)/$', 'ee.influences.views.add', name='influences_add_influence_for_character'), url(r'^influences/influence/add/$', 'ee.influences.views.add', name='influences_add_influence'), - url(r'^influences/influence/(?P\d+)/$', 'django.views.generic.list_detail.object_detail', influences_dict, name='influences_influence_detail'), + url(r'^influences/influence/(?P\d+)/$', 'ee.influences.views.influence_detail', influences_dict, name='influences_influence_detail'), - url(r'^influences/character/$', 'django.views.generic.list_detail.object_list', chars_dict, name='influences_character_list'), - url(r'^influences/character/(?P\d+)/$', 'django.views.generic.list_detail.object_detail', chars_dict, name='influences_character_detail'), + url(r'^influences/character/$', 'ee.influences.views.character_list', chars_dict, name='influences_character_list'), + url(r'^influences/character/(?P\d+)/$', 'ee.influences.views.character_detail', chars_dict, name='influences_character_detail'), url(r'^influences/character/add/$', 'ee.influences.views.addCharacter', name='influences_add_character'), url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}, name='login'), -- 2.30.2