From e7227f84ca06da6817722217cf27fe0b9b52b48b Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 2 Feb 2020 22:52:25 +0100
Subject: [PATCH] some more recipe edit cleanup

---
 cookbook/forms.py                                  | 2 ++
 cookbook/templates/forms/edit_internal_recipe.html | 7 +++----
 cookbook/views/edit.py                             | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cookbook/forms.py b/cookbook/forms.py
index 16eb1307..f4d495ae 100644
--- a/cookbook/forms.py
+++ b/cookbook/forms.py
@@ -47,6 +47,8 @@ class ExternalRecipeForm(forms.ModelForm):
 
 
 class InternalRecipeForm(forms.ModelForm):
+    ingredients = forms.CharField(widget=forms.HiddenInput(), required=False)
+
     class Meta:
         model = Recipe
         fields = ('name', 'instructions', 'image', 'working_time', 'waiting_time', 'keywords')
diff --git a/cookbook/templates/forms/edit_internal_recipe.html b/cookbook/templates/forms/edit_internal_recipe.html
index cfaa4341..97730dde 100644
--- a/cookbook/templates/forms/edit_internal_recipe.html
+++ b/cookbook/templates/forms/edit_internal_recipe.html
@@ -32,7 +32,6 @@
             {% endif %}
         {% endfor %}
 
-        <input type="hidden" id="ingredients_data_input" name="ingredients">
         <hr>
         <button class="btn btn-success" type="submit"><i class="fas fa-save"></i> {% trans 'Save' %}</button>
         <a href="{% url 'redirect_delete' form.instance|get_class|lower form.instance.pk %}"
@@ -153,7 +152,7 @@
                     {title: "id", field: "id", visible: false}
                 ],
                 dataEdited: function (data) {
-                    $('#ingredients_data_input').val(JSON.stringify(data))
+                    $('#id_ingredients').val(JSON.stringify(data))
 
                     data.forEach(function (cur, i) {
                         if (cur.delete) {
@@ -171,13 +170,13 @@
             });
 
             // load initial value
-            $('#ingredients_data_input').val(JSON.stringify(data))
+            $('#id_ingredients').val(JSON.stringify(data))
 
             document.getElementById("new_empty").addEventListener("click", function () {
                 data.push({
                     name: "{% trans 'Ingredient' %}",
                     amount: "100",
-                    unit: "g",
+                    unit__name: "g",
                     id: Math.floor(Math.random() * 10000000),
                     delete: false,
                 });
diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py
index 97f9b47c..36e1464a 100644
--- a/cookbook/views/edit.py
+++ b/cookbook/views/edit.py
@@ -73,7 +73,7 @@ def internal_recipe_update(request, pk):
 
             recipe.save()
 
-            form_ingredients = json.loads(form.data['ingredients'])
+            form_ingredients = json.loads(form.cleaned_data['ingredients'])
             RecipeIngredients.objects.filter(recipe=recipe_instance).delete()
 
             for i in form_ingredients: