From dd9091007f95120467ae89bcca2bf36a83329414 Mon Sep 17 00:00:00 2001 From: Kaibu Date: Tue, 19 Nov 2019 20:21:29 +0100 Subject: [PATCH] tabulator loading ingredients --- cookbook/templates/forms/edit_internal_recipe.html | 8 +++++++- cookbook/views/edit.py | 6 +++++- requirements.txt | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cookbook/templates/forms/edit_internal_recipe.html b/cookbook/templates/forms/edit_internal_recipe.html index 4c3dc55a6..69fe8fe24 100644 --- a/cookbook/templates/forms/edit_internal_recipe.html +++ b/cookbook/templates/forms/edit_internal_recipe.html @@ -42,7 +42,13 @@ $(document).ready(function () { $('#id_keywords').select2(); - var data = [] + var ingredients = {{ ingredients|safe }} + + ingredients.forEach(function (cur, i) { + cur.delete = false + }) + + var data = ingredients var table = new Tabulator("#ingredients-table", { index: "id", diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py index f92de2749..c8d010af7 100644 --- a/cookbook/views/edit.py +++ b/cookbook/views/edit.py @@ -1,3 +1,5 @@ +import simplejson as json + from django.contrib import messages from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin @@ -54,8 +56,10 @@ def internal_recipe_update(request, pk): ingredients = RecipeIngredients.objects.filter(recipe=recipe_instance) + print(list(ingredients)) + return render(request, 'forms/edit_internal_recipe.html', - {'form': form, 'ingredients': ingredients, 'view_url': reverse('view_recipe', args=[pk])}) + {'form': form, 'ingredients': json.dumps(list(ingredients.values())), 'view_url': reverse('view_recipe', args=[pk])}) class SyncUpdate(LoginRequiredMixin, UpdateView): diff --git a/requirements.txt b/requirements.txt index 89e1fca71..f464cf2b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,4 +11,5 @@ lxml webdavclient3 python-dotenv==0.7.1 psycopg2==2.7.4 -gunicorn==19.7.1 \ No newline at end of file +gunicorn==19.7.1 +simplejson \ No newline at end of file