From d031025352fb6c00f0db767405dcf2f39f976cd8 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Sat, 9 Feb 2008 23:50:18 +0100 Subject: [PATCH] * No longer use any generic views, since we will need to add access checks anyway, so we will need to redo a most of the stuff that the generic view does for us. --- influences/views.py | 15 +++++++++------ urls.py | 14 +++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/influences/views.py b/influences/views.py index 71e69ed..ba8e280 100644 --- a/influences/views.py +++ b/influences/views.py @@ -67,15 +67,18 @@ def index(request): 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) +def character_list(request): + os = request.user.character_set.all() + return render_to_response('influences/character_list.html', {'object_list' : os}, RequestContext(request)) @login_required -def character_detail(*args, **kwargs): - return object_detail(*args, **kwargs) +def character_detail(request, object_id): + o = Character.objects.get(pk=object_id) + return render_to_response('influences/character_detail.html', {'object' : o}, RequestContext(request)) @login_required -def influence_detail(*args, **kwargs): - return object_detail(*args, **kwargs) +def influence_detail(request, object_id): + o = Influence.objects.get(pk=object_id) + return render_to_response('influences/influence_detail.html', {'object' : o}, RequestContext(request)) # vim: set sts=4 sw=4 expandtab: diff --git a/urls.py b/urls.py index c873e1a..c96c6b1 100644 --- a/urls.py +++ b/urls.py @@ -3,14 +3,6 @@ from django.conf.urls.defaults import * from ee.influences.models import Character from ee.influences.models import Influence import os - -chars_dict = { - 'queryset': Character.objects.all(), -} - -influences_dict = { - 'queryset': Influence.objects.all(), -} urlpatterns = patterns('', url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}), @@ -19,10 +11,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+)/$', 'ee.influences.views.influence_detail', influences_dict, name='influences_influence_detail'), + url(r'^influences/influence/(?P\d+)/$', 'ee.influences.views.influence_detail', name='influences_influence_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/$', 'ee.influences.views.character_list', name='influences_character_list'), + url(r'^influences/character/(?P\d+)/$', 'ee.influences.views.character_detail', 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