Deleting sandwiches works.

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

diff --git a/views.py b/views.py
index e47a17f..7db1ab5 100644 (file)
--- a/views.py
+++ b/views.py
@@ -39,7 +39,7 @@ def add_sandwich(request):
                                for n in y:
                                        if n.isdigit():
                                                newsandwich.ingredients.add(Ingredient.objects.get(id=n))
-                                       else:
+                                       elif n[:4] == 'new:' and len(n) > 4:
                                                n = n.lstrip('new:')
                                                newingredient = Ingredient(name=n, slug=SlugifyUniquely(n, Ingredient))
                                                newingredient.save()
@@ -54,8 +54,7 @@ def add_sandwich(request):
                
 def edit_sandwich(request, slug):
        sedit = Sandwich.objects.get(slug=slug)
-       if sedit.picture:
-               savedpicture = sedit.picture.url
+       ingred = sedit.ingredients.all()
        if request.user.is_authenticated():
                if not sedit.user == request.user:
                        return HttpResponseRedirect(reverse('all_sandwiches'))
@@ -63,27 +62,41 @@ 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
-                                       newsandwich = sform.save()
+                                       sedit.adjective = request.POST['adjective']
+                                       sedit.date_made = request.POST['date_made']
+                                       sedit.notes = request.POST['notes']
+                                       for ig in sedit.ingredients.all():
+                                               sedit.ingredients.remove(ig)
+                                       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():
-                                                       newsandwich.ingredients.add(Ingredient.objects.get(id=n))
-                                               else:
+                                                       sedit.ingredients.add(Ingredient.objects.get(id=n))
+                                               elif n[:4] == 'new:' and len(n) > 4:
                                                        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))
+                       return render_to_response('editsandwich.html', {'sform': sform, 's':sedit, 'prepop': ingred, }, context_instance=RequestContext(request))
+       else:
+               return HttpResponseRedirect(reverse('login2'))
+               
+def del_sandwich(request, slug):
+       if request.user.is_authenticated():
+               if Sandwich.objects.get(slug=slug):
+                       del_sandwich = Sandwich.objects.get(slug=slug)
+                       if request.user == del_sandwich.user:
+                               del_sandwich.delete()
+                       return HttpResponseRedirect(reverse('all_sandwiches'))
+               else:
+                       return HttpResponseRedirect(reverse('all_sandwiches'))
        else:
                return HttpResponseRedirect(reverse('login2'))