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

[~kgodey/maayanwich.git] / views.py

diff --git a/views.py b/views.py
index cb8e7e6..6afbe78 100644 (file)
--- 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 = "<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')
-                       
-       return render_to_response('sandwich.html', {'sform': form, 'sandwiches': sandwiches,})
-
+       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:
+               thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
+               return HttpResponse(thankshtml) # Redirect after POST
 
 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
-       else:
-               form = IngredientForm() # An unbound form
+       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})
-       
+               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:
@@ -58,7 +62,7 @@ def all_sandwich(request):
                raise Http404
        return render_to_response('allsandwiches.html', {'allsandwiches': allsandwiches, 'sandwiches': sandwiches})
 
-       
+
 def baseview(request):
        try:
                if Sandwich.objects.count() > 5:
@@ -70,16 +74,20 @@ def baseview(request):
        except Sandwich.DoesNotExist:
                raise Http404
        return render_to_response('base.html', {'sandwiches': sandwiches, 'all': allsandwiches,})
-       
-       
+
+
 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):
        try:
                s = Sandwich.objects.get(slug=slug)
@@ -115,7 +123,8 @@ def login_view(request):
        except KeyError:
                aform = AuthenticationForm()
                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]