Moving iteration stuff into projects.

4 files changed, 14 insertions, 15 deletions

diff --git a/snakeplan/projects/templates/iterations/iteration_list.html b/snakeplan/projects/templates/projects/iteration_list.html
index f4b6e29..f4b6e29 100644
--- a/snakeplan/projects/templates/iterations/iteration_list.html
+++ b/snakeplan/projects/templates/projects/iteration_list.html
diff --git a/snakeplan/projects/urls.py b/snakeplan/projects/urls.py
index cd16a85..d477430 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.index'),
+    (r'^(.*)/', 'projects.project_iterations'),
 )
diff --git a/snakeplan/projects/views/iterations.py b/snakeplan/projects/views/iterations.py
deleted file mode 100644
index 4c6568e..0000000
--- a/snakeplan/projects/views/iterations.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from django.views.generic import list_detail
-from snakeplan.projects.models import Iteration
-
-def index(request, project_id):
-    iterations = Iteration.objects.filter(project=project_id)
-    project = iterations[0].project
-
-    return list_detail.object_list(
-        request=request,
-        template_name='iterations/iteration_list.html',
-        queryset=iterations,
-        extra_context={'project_name': project},
-        allow_empty=True
-        )
diff --git a/snakeplan/projects/views/projects.py b/snakeplan/projects/views/projects.py
index 288083e..78de64c 100644
--- a/snakeplan/projects/views/projects.py
+++ b/snakeplan/projects/views/projects.py
@@ -1,5 +1,6 @@
 from django.views.generic import list_detail
 from snakeplan.projects.models import Project
+from snakeplan.projects.models import Iteration
 
 
 def index(request):
@@ -8,3 +9,15 @@ def index(request):
         queryset=Project.objects.all(),
         allow_empty=True
         )
+
+
+def project_iterations(request, project_id):
+    iterations = Iteration.objects.filter(project=project_id)
+    project = iterations[0].project
+
+    return list_detail.object_list(
+        request=request,
+        queryset=iterations,
+        extra_context={'project_name': project},
+        allow_empty=True
+        )