From 9b6c24b6fcc212755e57e31c835a73354d074799 Mon Sep 17 00:00:00 2001 From: Kriti Godey Date: Thu, 4 Mar 2010 22:48:49 -0500 Subject: [PATCH 1/1] Added necessity for user authentication to add sandwich, ingredient, and templated up the monthly view. --- views.py | 68 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/views.py b/views.py index 18f6ea1..6afbe78 100644 --- a/views.py +++ b/views.py @@ -11,41 +11,45 @@ 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 - if form.is_valid(): # All validation rules pass - newsandwich = form.save() - newsandwich.save() - thankshtml = "

Thanks! Your sandwich has been added!

" - return HttpResponse(thankshtml) # Redirect after POST - else: - form = SandwichForm() # An unbound form - if Sandwich.objects.count() > 5: sandwiches = Sandwich.objects.order_by('date_made')[:5] else: sandwiches = Sandwich.objects.order_by('date_made') - - 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 - newsandwich = form.save() - newsandwich.save() - thankshtml = "

Thanks! Your ingredient has been saved!

" - return HttpResponse(thankshtml) # Redirect after POST + if request.user.is_authenticated(): + 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 + newsandwich = form.save() + newsandwich.save() + thankshtml = "

Thanks! Your sandwich has been added!

" + return HttpResponse(thankshtml) # Redirect after POST + else: + form = SandwichForm() # An unbound form + return render_to_response('sandwich.html', {'sform': form, 'sandwiches': sandwiches,}) else: - form = IngredientForm() # An unbound form + thankshtml = "

You are not logged in.

" + return HttpResponse(thankshtml) # Redirect after POST - return render_to_response('ingredient.html', {'iform': form, 'sandwiches': sandwiches}) +def add_ingredient(request): + if request.user.is_authenticated(): + 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 + newsandwich = form.save() + newsandwich.save() + thankshtml = "

Thanks! Your ingredient has been saved!

" + return HttpResponse(thankshtml) # Redirect after POST + else: + form = IngredientForm() # An unbound form + return render_to_response('ingredient.html', {'iform': form, 'sandwiches': sandwiches}) + else: + thankshtml = "

You are not logged in.

" + return HttpResponse(thankshtml) # Redirect after POST def all_sandwich(request): try: @@ -74,10 +78,14 @@ def baseview(request): def sandwich_month(request, year, month): try: - sandwiches = Sandwich.objects.filter(date_made__month=month, date_made__year=year) + ms = Sandwich.objects.filter(date_made__month=month, date_made__year=year) + 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': ms, 'sandwiches': sandwiches,}) def specific_sandwich(request, slug): -- 2.20.1