Added necessity for user authentication to add sandwich, ingredient, and templated...

diff --git a/views.py b/views.py
index 18f6ea1..6afbe78 100644 (file)
--- a/views.py
+++ b/views.py
@@ -11,41 +11,45 @@ import datetime
 
 
 def add_sandwich(request):
 
 
 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 = "<p class=\"formthanks\">Thanks! Your sandwich has been added!</p>"
-                       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')
        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 = "<p class=\"formthanks\">Thanks! Your ingredient has been saved!</p>"
-                       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 = "<p class=\"formthanks\">Thanks! Your sandwich has been added!</p>"
+                               return HttpResponse(thankshtml) # Redirect after POST
+               else:
+                       form = SandwichForm() # An unbound form
+               return render_to_response('sandwich.html', {'sform': form, 'sandwiches': sandwiches,})

        else:
        else:

-               form = IngredientForm() # An unbound form
+               thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
+               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 = "<p class=\"formthanks\">Thanks! Your ingredient has been saved!</p>"
+                               return HttpResponse(thankshtml) # Redirect after POST
+               else:
+                       form = IngredientForm() # An unbound form

 
 

+               return render_to_response('ingredient.html', {'iform': form, 'sandwiches': sandwiches})
+       else:
+               thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
+               return HttpResponse(thankshtml) # Redirect after POST

 
 def all_sandwich(request):
        try:
 
 def all_sandwich(request):
        try:


@@ -74,10 +78,14 @@ def baseview(request):
 
 def sandwich_month(request, year, month):
        try:
 
 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
        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):
 
 
 def specific_sandwich(request, slug):