X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/0ee52e2ec5e267a0c73092202902707176f96e2e..c3f9729b3ffa534a9cea5e501859ea0db49f8551:/views.py

diff --git a/views.py b/views.py
index 49f1c68..3b12aec 100644
--- a/views.py
+++ b/views.py
@@ -1,13 +1,12 @@
 from django.http import HttpResponse
-from forms import SandwichForm, IngredientForm, ArtistForm
+from forms import SandwichForm, IngredientForm
 from django.shortcuts import render_to_response
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.template.defaultfilters import slugify
-from models import Sandwich, Artist, Ingredient
+from models import Sandwich, Ingredient
+from django.http import Http404
 import datetime
 
 
-
 def add_sandwich(request):
 	if request.method == 'POST': # If the form has been submitted...
 		form = SandwichForm(request.POST, request.FILES) # A form bound to the POST data
@@ -20,8 +19,8 @@ def add_sandwich(request):
 		form = SandwichForm() # An unbound form
 		
 	return render_to_response('sandwich.html', {'sform': form,})
-	
-	
+
+
 def add_ingredient(request):
 	if request.method == 'POST': # If the form has been submitted...
 		form = IngredientForm(request.POST) # A form bound to the POST data
@@ -35,3 +34,20 @@ def add_ingredient(request):
 
 	return render_to_response('ingredient.html', {'iform': form,})
 	
+
+def all_sandwich(request):
+	try:
+		sandwiches = Sandwich.objects.all()
+	except Sandwich.DoesNotExist:
+	        raise Http404
+	return render_to_response('allsandwiches.html', {'sandwiches': sandwiches,})
+	
+def newsandwiches(request):
+	try:
+		if Sandwich.objects.count() > 5:
+			sandwiches = Sandwich.objects.order_by('date_made')[:5]
+		else:
+			sandwiches = Sandwich.objects.order_by('date_made')
+	except Sandwich.DoesNotExist:
+	        raise Http404
+	return render_to_response('allsandwiches.html', {'sandwiches': sandwiches,})
\ No newline at end of file