Fix bug: initial version data in view

This commit is contained in:
Benjamin 2023-03-05 18:52:32 +01:00
parent fff2d0b345
commit b3ef2853b6

View file

@ -43,9 +43,13 @@ INGREDIENTS_FORMSET_PREFIX = 'ingredient'
@permission_required('recipes.add_recipe') @permission_required('recipes.add_recipe')
def add_version(request, slug_recipe): def add_version(request, slug_recipe):
recipe = Recipe.objects.get(slug=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': 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) ingredients_formset = IngredientFormSet(request.POST, queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
version_form.recipe_id = recipe.id # type: ignore 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})) return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
else: else:
if (recipe.versions.all().count() > 0): # type: ignore version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=version_initial)
initial = {'label': '', 'slug': ''}
else:
initial = {}
version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=initial)
version_form.fields['author'].widget.attrs['placeholder'] = request.user.first_name if request.user.first_name else request.user.username 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) ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)