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
Editing a sandwich works, except for the ingredients.
[~kgodey/maayanwich.git]
/
views.py
diff --git
a/views.py
b/views.py
index
e47a17f
..
dc62977
100644
(file)
--- a/
views.py
+++ b/
views.py
@@
-54,8
+54,6
@@
def add_sandwich(request):
def edit_sandwich(request, slug):
sedit = Sandwich.objects.get(slug=slug)
def edit_sandwich(request, slug):
sedit = Sandwich.objects.get(slug=slug)
- if sedit.picture:
- savedpicture = sedit.picture.url
if request.user.is_authenticated():
if not sedit.user == request.user:
return HttpResponseRedirect(reverse('all_sandwiches'))
if request.user.is_authenticated():
if not sedit.user == request.user:
return HttpResponseRedirect(reverse('all_sandwiches'))
@@
-63,24
+61,24
@@
def edit_sandwich(request, slug):
if request.method == 'POST':
sform = SandwichForm(request.POST, request.FILES, instance=sedit)
if sform.is_valid(): # All validation rules pass
if request.method == 'POST':
sform = SandwichForm(request.POST, request.FILES, instance=sedit)
if sform.is_valid(): # All validation rules pass
- newsandwich = sform.save()
+ sedit.adjective = request.POST['adjective']
+ sedit.date_made = request.POST['date_made']
+ sedit.notes = request.POST['notes']
+ if request.POST['picture']:
+ sedit.picture = request.POST['picture']
x = request.POST['ing']
x = x.strip()
y = x.split(',')
for n in y:
if n.isdigit():
x = request.POST['ing']
x = x.strip()
y = x.split(',')
for n in y:
if n.isdigit():
-
newsandwich
.ingredients.add(Ingredient.objects.get(id=n))
+
sedit
.ingredients.add(Ingredient.objects.get(id=n))
else:
n = n.lstrip('new:')
newingredient = Ingredient(name=n, slug=SlugifyUniquely(n, Ingredient))
newingredient.save()
else:
n = n.lstrip('new:')
newingredient = Ingredient(name=n, slug=SlugifyUniquely(n, Ingredient))
newingredient.save()
- newsandwich.ingredients.add(newingredient)
- if not newsandwich.picture:
- if savedpicture:
- newsandwich.picture = savedpicture
- newsandwich.slug = slug
- newsandwich.save()
- return HttpResponseRedirect(newsandwich.get_absolute_url())
+ sedit.ingredients.add(newingredient)
+ sedit.save()
+ return HttpResponseRedirect(sedit.get_absolute_url())
else:
sform = SandwichForm(instance=sedit)
return render_to_response('editsandwich.html', {'sform': sform, 's':sedit,}, context_instance=RequestContext(request))
else:
sform = SandwichForm(instance=sedit)
return render_to_response('editsandwich.html', {'sform': sform, 's':sedit,}, context_instance=RequestContext(request))