From b3ef2853b6a7175054787ebc494cacd3c567bad0 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Sun, 5 Mar 2023 18:52:32 +0100 Subject: [PATCH] Fix bug: initial version data in view --- recipes/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/views.py b/recipes/views.py index 5b7883e..5ef9087 100644 --- a/recipes/views.py +++ b/recipes/views.py @@ -43,9 +43,13 @@ INGREDIENTS_FORMSET_PREFIX = 'ingredient' @permission_required('recipes.add_recipe') def add_version(request, slug_recipe): recipe = Recipe.objects.get(slug=slug_recipe) + if (recipe.versions.all().count() > 0): # type: ignore + version_initial = {'label': '', 'slug': ''} + else: + version_initial = {} if request.method == 'POST': - version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX) + version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, initial=version_initial) ingredients_formset = IngredientFormSet(request.POST, queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX) version_form.recipe_id = recipe.id # type: ignore @@ -62,11 +66,7 @@ def add_version(request, slug_recipe): return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug})) else: - if (recipe.versions.all().count() > 0): # type: ignore - initial = {'label': '', 'slug': ''} - else: - initial = {} - version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=initial) + version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=version_initial) version_form.fields['author'].widget.attrs['placeholder'] = request.user.first_name if request.user.first_name else request.user.username ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)