git.ithinksw.org
/
~kgodey
/
maayanwich.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed URLs of one-sandwich views. Fixed adding sandwiches.
[~kgodey/maayanwich.git]
/
views.py
diff --git
a/views.py
b/views.py
index
eb02bad
..
cb8e7e6
100644
(file)
--- a/
views.py
+++ b/
views.py
@@
-21,10
+21,19
@@
def add_sandwich(request):
else:
form = SandwichForm() # An unbound form
else:
form = SandwichForm() # An unbound form
- return render_to_response('sandwich.html', {'sform': 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):
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
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
+44,32
@@
def add_ingredient(request):
else:
form = IngredientForm() # An unbound form
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:
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
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]
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')
else:
sandwiches = Sandwich.objects.order_by('date_made')
+ allsandwiches = Sandwich.objects.all()
except Sandwich.DoesNotExist:
raise Http404
except Sandwich.DoesNotExist:
raise Http404
- return render_to_response('
allsandwiches.html', {'sandwiches':
sandwiches,})
+ return render_to_response('
base.html', {'sandwiches': sandwiches, 'all': all
sandwiches,})
def sandwich_month(request, year, month):
def sandwich_month(request, year, month):
@@
-67,13
+82,21
@@
def sandwich_month(request, year, month):
def specific_sandwich(request, slug):
try:
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
except Sandwich.DoesNotExist:
raise Http404
- return render_to_response('onesandwich.html', {'s': sandwiches,})
+ return render_to_response('onesandwich.html', {'s': s
, 'sandwiches': s
andwiches,})
def login_view(request):
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']
try:
username = request.POST['username']
password = request.POST['password']
@@
-91,9
+114,13
@@
def login_view(request):
return HttpResponse(thankshtml)
except KeyError:
aform = AuthenticationForm()
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):
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)
if request.user.is_authenticated():
thankshtml = "<p class=\"formthanks\">You are already logged in!</p>"
return HttpResponse(thankshtml)
@@
-119,4
+146,4
@@
def create_user(request):
return HttpResponse(thankshtml) # Redirect after POST
else:
form = NewUserForm() # An unbound form
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