X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/d9db56e5acb06105b3cd05cc682936003500597d..735e53fa41a4911c1464a25ed0f24ac8769b878f:/views.py

diff --git a/views.py b/views.py
index eb02bad..2b92417 100644
--- a/views.py
+++ b/views.py
@@ -11,6 +11,10 @@ import datetime
 
 
 def add_sandwich(request):
+	if Sandwich.objects.count() > 5:
+		sandwiches = Sandwich.objects.order_by('date_made')[:5]
+	else:
+		sandwiches = Sandwich.objects.order_by('date_made')
 	if request.method == 'POST': # If the form has been submitted...
 		form = SandwichForm(request.POST, request.FILES) # A form bound to the POST data
 		if form.is_valid(): # All validation rules pass
@@ -21,10 +25,14 @@ def add_sandwich(request):
 	else:
 		form = SandwichForm() # An unbound form
 		
-	return render_to_response('sandwich.html', {'sform': form,})
+	return render_to_response('sandwich.html', {'sform': form, 'sandwiches': sandwiches,})
 
 
 def add_ingredient(request):
+	if Sandwich.objects.count() > 5:
+		sandwiches = Sandwich.objects.order_by('date_made')[:5]
+	else:
+		sandwiches = Sandwich.objects.order_by('date_made')
 	if request.method == 'POST': # If the form has been submitted...
 		form = IngredientForm(request.POST) # A form bound to the POST data
 		if form.is_valid(): # All validation rules pass
@@ -35,26 +43,32 @@ def add_ingredient(request):
 	else:
 		form = IngredientForm() # An unbound form
 
-	return render_to_response('ingredient.html', {'iform': form,})
+	return render_to_response('ingredient.html', {'iform': form, 'sandwiches': sandwiches})
 	
 
 def all_sandwich(request):
 	try:
-		sandwiches = Sandwich.objects.all()
+		allsandwiches = Sandwich.objects.all()
+		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,})
+	return render_to_response('allsandwiches.html', {'allsandwiches': allsandwiches, 'sandwiches': sandwiches})
 
 	
-def newsandwiches(request):
+def baseview(request):
 	try:
 		if Sandwich.objects.count() > 5:
 			sandwiches = Sandwich.objects.order_by('date_made')[:5]
+			allsandwiches = Sandwich.objects.all()
 		else:
 			sandwiches = Sandwich.objects.order_by('date_made')
+			allsandwiches = Sandwich.objects.all()
 	except Sandwich.DoesNotExist:
 	        raise Http404
-	return render_to_response('allsandwiches.html', {'sandwiches': sandwiches,})
+	return render_to_response('base.html', {'sandwiches': sandwiches, 'all': allsandwiches,})
 	
 	
 def sandwich_month(request, year, month):
@@ -67,13 +81,21 @@ def sandwich_month(request, year, month):
 	
 def specific_sandwich(request, slug):
 	try:
-		sandwiches = Sandwich.objects.get(slug=slug)
+		s = Sandwich.objects.get(slug=slug)
+		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('onesandwich.html', {'s': sandwiches,})
+	return render_to_response('onesandwich.html', {'s': s, 'sandwiches': sandwiches,})
 
 
 def login_view(request):
+	if Sandwich.objects.count() > 5:
+		sandwiches = Sandwich.objects.order_by('date_made')[:5]
+	else:
+		sandwiches = Sandwich.objects.order_by('date_made')
 	try:
 		username = request.POST['username']
 		password = request.POST['password']
@@ -91,9 +113,13 @@ def login_view(request):
 			return HttpResponse(thankshtml)
 	except KeyError:
 		aform = AuthenticationForm()
-		return render_to_response('login.html', {'aform': aform,})
+		return render_to_response('login.html', {'aform': aform, 'sandwiches': sandwiches,})
 		
 def create_user(request):
+	if Sandwich.objects.count() > 5:
+		sandwiches = Sandwich.objects.order_by('date_made')[:5]
+	else:
+		sandwiches = Sandwich.objects.order_by('date_made')
 	if request.user.is_authenticated():
 		thankshtml = "<p class=\"formthanks\">You are already logged in!</p>"
 		return HttpResponse(thankshtml)
@@ -119,4 +145,4 @@ def create_user(request):
 				return HttpResponse(thankshtml) # Redirect after POST	
 	else:
 		form = NewUserForm() # An unbound form
-		return render_to_response('newuser.html', {'cform': form,})
\ No newline at end of file
+		return render_to_response('newuser.html', {'cform': form, 'sandwiches': sandwiches,})
\ No newline at end of file