From caa9f58c3a67804e8701069fd50a774ce1ca9d9d Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Sat, 20 Feb 2010 14:21:52 -0500 Subject: Finished converting things to generic views. --- snakeplan/projects/templates/iteration_list.html | 9 --------- .../projects/templates/iterations/iteration_list.html | 4 ++-- snakeplan/projects/urls.py | 2 +- snakeplan/projects/views/iterations.py | 17 ++++++++++------- 4 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 snakeplan/projects/templates/iteration_list.html diff --git a/snakeplan/projects/templates/iteration_list.html b/snakeplan/projects/templates/iteration_list.html deleted file mode 100644 index 4b92f71..0000000 --- a/snakeplan/projects/templates/iteration_list.html +++ /dev/null @@ -1,9 +0,0 @@ -

Project: {{project_name}}

- -

Iterations

- - diff --git a/snakeplan/projects/templates/iterations/iteration_list.html b/snakeplan/projects/templates/iterations/iteration_list.html index 4b92f71..f4b6e29 100644 --- a/snakeplan/projects/templates/iterations/iteration_list.html +++ b/snakeplan/projects/templates/iterations/iteration_list.html @@ -2,8 +2,8 @@

Iterations

diff --git a/snakeplan/projects/urls.py b/snakeplan/projects/urls.py index 703af8f..cd16a85 100644 --- a/snakeplan/projects/urls.py +++ b/snakeplan/projects/urls.py @@ -4,5 +4,5 @@ from django.conf.urls.defaults import patterns urlpatterns = patterns('snakeplan.projects.views', (r'^$', 'projects.index'), (r'^story/(.*)/', 'stories.index'), - (r'^(.*)/', 'iterations.iteration_list'), + (r'^(.*)/', 'iterations.index'), ) diff --git a/snakeplan/projects/views/iterations.py b/snakeplan/projects/views/iterations.py index d44fec5..4c6568e 100644 --- a/snakeplan/projects/views/iterations.py +++ b/snakeplan/projects/views/iterations.py @@ -1,11 +1,14 @@ -from django.shortcuts import render_to_response -from snakeplan.projects.models import Project, Iteration +from django.views.generic import list_detail +from snakeplan.projects.models import Iteration -def iteration_list(request, project_id): +def index(request, project_id): iterations = Iteration.objects.filter(project=project_id) project = iterations[0].project - return render_to_response("iterations/iteration_list.html", - {"project_name" : project.name, - "iterations" : iterations, - }) + return list_detail.object_list( + request=request, + template_name='iterations/iteration_list.html', + queryset=iterations, + extra_context={'project_name': project}, + allow_empty=True + ) -- cgit v1.2.3