Barn/django-project
1
0
Fork 0
Code Issues 6 Pull requests Packages Projects 1 Releases Activity

Compare commits

base: Barn:818df6f263d9abff7566f7ceb309bcb0f519288b
Branches Tags
Barn:master
...
compare: Barn:b3ef2853b6a7175054787ebc494cacd3c567bad0
Branches Tags
Barn:master

2 commits
818df6f263 ... b3ef2853b6

Author SHA1 Message Date
Benjamin b3ef2853b6 Fix bug: initial version data in view 2023-03-05 18:52:32 +01:00
Benjamin fff2d0b345 Delete unnecessary initial data 2023-03-05 18:42:05 +01:00
1 changed files with 6 additions and 11 deletions
Show stats Expand all files Collapse all files

17
recipes/views.py
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)
@ -98,11 +98,6 @@ def edit_version(request, slug_recipe, slug_version):
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:
version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX) version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX)
initial = []
for ingredient in version.ingredients.all(): # type: ignore
initial.append({'text': ingredient.text})
ingredients_formset = IngredientFormSet(queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore ingredients_formset = IngredientFormSet(queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
return render(request, 'edit-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset}) return render(request, 'edit-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})