Merging in Ben's changes

5 files changed, 33 insertions, 5 deletions

diff --git a/snakeplan/projects/templates/projects/story_detail.html b/snakeplan/projects/templates/projects/story_detail.html
new file mode 100644
index 0000000..f8ade89
--- /dev/null
+++ b/snakeplan/projects/templates/projects/story_detail.html
@@ -0,0 +1,5 @@
+<h1>{{ object.name }}</h1>
+
+<ol>
+    <li> {{ object }} </li>
+</ol>
diff --git a/snakeplan/projects/templates/projects/story_list.html b/snakeplan/projects/templates/projects/story_list.html
new file mode 100644
index 0000000..4424ac4
--- /dev/null
+++ b/snakeplan/projects/templates/projects/story_list.html
@@ -0,0 +1,8 @@
+<h1>Iteration: {{ iteration_name }}</h1>
+
+<h2>Stories</h2>
+<ol>
+    {% for story in object_list %}
+    <li><a href="/project/story/{{story.id}}/">{{story.name}}</a></li>
+    {% endfor %}
+</ol>
diff --git a/snakeplan/projects/urls.py b/snakeplan/projects/urls.py
index d477430..46c10a4 100644
--- a/snakeplan/projects/urls.py
+++ b/snakeplan/projects/urls.py
@@ -4,5 +4,6 @@ from django.conf.urls.defaults import patterns
 urlpatterns = patterns('snakeplan.projects.views',
     (r'^$', 'projects.index'),
     (r'^story/(.*)/', 'stories.index'),
+    (r'^iteration/(.*)/', 'iterations.index'),
     (r'^(.*)/', 'projects.project_iterations'),
 )
diff --git a/snakeplan/projects/views/iterations.py b/snakeplan/projects/views/iterations.py
new file mode 100644
index 0000000..eae5c89
--- /dev/null
+++ b/snakeplan/projects/views/iterations.py
@@ -0,0 +1,14 @@
+from django.views.generic import list_detail
+from snakeplan.projects.models import Iteration
+from snakeplan.projects.models import Story
+
+def index(request, iteration_id):
+    stories = Story.objects.filter(iteration=iteration_id)
+    iteration = stories[0].iteration
+
+    return list_detail.object_list(
+        request=request,
+        queryset=stories,
+        extra_context={'iteration_name': iteration},
+        allow_empty = True
+        )
diff --git a/snakeplan/projects/views/stories.py b/snakeplan/projects/views/stories.py
index f87bb2b..39bc323 100644
--- a/snakeplan/projects/views/stories.py
+++ b/snakeplan/projects/views/stories.py
@@ -1,10 +1,10 @@
 from django.views.generic import list_detail
-from snakeplan.projects.models import Iteration
+from snakeplan.projects.models import Story
 
 
-def index(request, project_id):
-    return list_detail.object_list(
+def index(request, story_id):
+    return list_detail.object_detail(
         request=request,
-        queryset=Iteration.objects.filter(project=project_id).all(),
-        allow_empty=True
+        queryset=Story.objects.filter(id=story_id).all(),
+        object_id=story_id,
         )