Adding new views for details, fixing regexes for urlconf

3 files changed, 10 insertions, 3 deletions

diff --git a/greenbox/recipe/urls.py b/greenbox/recipe/urls.py
index d344e0a..4c937a0 100644
--- a/greenbox/recipe/urls.py
+++ b/greenbox/recipe/urls.py
@@ -2,5 +2,6 @@ from django.conf.urls.defaults import patterns, url
 
 
 urlpatterns = patterns('recipe.views',
+    url(r'^(?P<slug>[^/]+)', 'recipe_details'),
     url(r'^$', 'recipe_list'),
 )
diff --git a/greenbox/recipe/views.py b/greenbox/recipe/views.py
index d1872c5..3efdb9e 100644
--- a/greenbox/recipe/views.py
+++ b/greenbox/recipe/views.py
@@ -1,6 +1,11 @@
 from models import Recipe
-from django.views.generic.list_detail import object_list
+from django.views.generic import list_detail
 
 
 def recipe_list(request):
-    return object_list(request, queryset=Recipe.objects.all())
+    data = Recipe.objects.all()
+    return list_detail.object_list(request, queryset=data)
+
+
+def recipe_details(request, slug):
+    return list_detail.object_detail(request, queryset=Recipe.objects.all(), slug=slug)
diff --git a/greenbox/urls.py b/greenbox/urls.py
index 7ee6f28..fb38894 100644
--- a/greenbox/urls.py
+++ b/greenbox/urls.py
@@ -2,6 +2,7 @@ from django.conf.urls.defaults import patterns, include, url
 from django.contrib import admin; admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'^$', include('recipe.urls')),
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^recipe/', include('recipe.urls')),
+    url(r'^$', include('recipe.urls')),
 )