fixup! Add forms for adding recipes and versions

implement edit version with bug where editing and saving yields existing
slug error

recipes/forms.py

@@ -1,4 +1,4 @@
-from django.forms import ModelForm, ValidationError, formset_factory, BooleanField
+from django.forms import ModelForm, ValidationError, modelformset_factory, BooleanField
 from .models import Recipe, Version, Ingredient
 
 class VersionForm(ModelForm):
@@ -20,4 +20,4 @@ class IngredientForm(ModelForm):
 		model = Ingredient
 		fields = ['text']
 
-IngredientFormSet = formset_factory(IngredientForm, extra=1)
+IngredientFormSet = modelformset_factory(Ingredient, fields=('text',), extra=1)

recipes/templates/edit-version.html

@@ -0,0 +1,40 @@
+{% extends "base_main.html" %}
+{% block title %}{{ recipe.title }}{% endblock %}
+{% block main %}
+<form action="" method="post" id="edit-version-form">
+	{%csrf_token %}
+	<table>
+		{{ version_form.as_table }}
+	</table>
+	{{ ingredients_formset.management_form }}
+	{% for ingredient_form in ingredients_formset %}
+		{{ ingredient_form.as_div }}
+	{% endfor %}
+	<button id="add-ingredient" type="button">Add Ingredient</button>
+	<input type="submit" value="Submit">
+</form>
+
+<script>
+	let firstIngredientDiv = document.querySelector("input[id^=id_ingredient][id$=text]").parentElement;
+	let addIngredientButton = document.querySelector("#add-ingredient");
+	let form = document.querySelector("#edit-version-form");
+	let totalIngredientFormsInput = document.querySelector("#id_ingredient-TOTAL_FORMS");
+
+	addIngredientButton.addEventListener('click', addIngredient);
+
+	function addIngredient(e) {
+		let nextIngredientIndex = document.querySelectorAll("input[id^=id_ingredient][id$=text]").length
+		e.preventDefault();
+
+		let newIngredientDiv = firstIngredientDiv.cloneNode(true);
+		let formRegex = new RegExp('ingredient-(\\d){1}-', 'g');
+
+		newIngredientDiv.innerHTML = newIngredientDiv.innerHTML.replace(formRegex, `ingredient-${nextIngredientIndex}-`);
+
+		form.insertBefore(newIngredientDiv, addIngredientButton);
+		totalIngredientFormsInput.setAttribute('value', `${nextIngredientIndex + 1}`);
+	}
+
+</script>
+
+{% endblock %}

recipes/templates/version.html

@@ -7,6 +7,7 @@
 {% endif %}
 {% if perms.recipes.add_recipe %}
 <p><a href="{% url 'add-version' recipe.slug %}">Add version</a></p>
+<p><a href="{% url 'edit-version' recipe.slug version.slug %}">Edit Version</a></p>
 {% endif %}
 	<ul>
 		{% for i in ingredients %}

recipes/urls.py

@@ -4,6 +4,7 @@ from . import views
 urlpatterns = [
 	path('', views.recipes, name='recipes'),
 	path('<slug:slug_recipe>/add-version/', views.add_version, name='add-version'),
+	path('<slug:slug_recipe>/<slug:slug_version>/edit-version/', views.edit_version, name='edit-version'),
 	path('<slug:slug_recipe>/<slug:slug_version>/', views.version, name='version'),
 	path('<slug:slug>/', views.recipe, name='recipe'),
 ]

recipes/views.py

@@ -1,5 +1,5 @@
 from django.shortcuts import render, get_object_or_404
-from .models import Recipe, Version
+from .models import Recipe, Version, Ingredient
 from .forms import VersionForm, IngredientFormSet
 from django.contrib.auth.decorators import login_required, permission_required
 from django.urls import reverse
@@ -46,22 +46,16 @@ def add_version(request, slug_recipe):
 
 	if request.method == 'POST':
 		version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX)
-		ingredients_formset = IngredientFormSet(request.POST, 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
 
 		if version_form.is_valid() and ingredients_formset.is_valid():
 			version = version_form.save(commit=False)
 			version.user = request.user
-
-			if 'author' in version_form.cleaned_data:
-				version.author = version_form.cleaned_data['author']
-
 			version.recipe = recipe
 			version.save()
 
-			for ingredient_form in ingredients_formset:
+			for ingredient in ingredients_formset.save(commit=False):
-				if 'text' in ingredient_form.cleaned_data and ingredient_form.cleaned_data['text']:
-					ingredient = ingredient_form.save(commit=False)
 					ingredient.version = version
 					ingredient.save()
 
@@ -74,6 +68,41 @@ def add_version(request, slug_recipe):
 			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
-		ingredients_formset = IngredientFormSet(prefix=INGREDIENTS_FORMSET_PREFIX)
+		ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
 
 	return render(request, 'add-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
+
+@login_required
+@permission_required('recipes.add_recipe')
+def edit_version(request, slug_recipe, slug_version):
+	recipe = get_object_or_404(Recipe, slug=slug_recipe)
+	version = get_object_or_404(Version, recipe=recipe, slug=slug_version)
+
+	if request.method == 'POST':
+		version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, instance=version)
+		ingredients_formset = IngredientFormSet(request.POST, queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
+		version_form.recipe_id = recipe.id # type: ignore
+
+		if version_form.is_valid() and ingredients_formset.is_valid():
+			if version_form.has_changed():
+				version = version_form.save(commit=False)
+				version.user = request.user
+				version.recipe = recipe
+				version.save()
+
+			if ingredients_formset.has_changed():
+				for ingredient in ingredients_formset.save(commit=False):
+						ingredient.version = version
+						ingredient.save()
+
+			return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
+	else:
+		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
+
+	return render(request, 'edit-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})