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

Compare commits

base: Barn:b6af65e9158ad4ff44cf9cfa5d8239a049ca3f19
Branches Tags
Barn:master
..
compare: Barn:b3ef2853b6a7175054787ebc494cacd3c567bad0
Branches Tags
Barn:master

No commits in common. "b6af65e9158ad4ff44cf9cfa5d8239a049ca3f19" and "b3ef2853b6a7175054787ebc494cacd3c567bad0" have entirely different histories.
b6af65e915 ... b3ef2853b6

5 changed files with 8 additions and 90 deletions
Show stats Expand all files Collapse all files

13
recipes/forms.py
View file

@ -1,22 +1,9 @@
from django.forms import ModelForm, ValidationError, modelformset_factory, BooleanField
from .models import Recipe, Version, Ingredient
class RecipeForm(ModelForm):
class Meta:
model = Recipe
fields = ['title', 'slug']
class VersionForm(ModelForm):
recipe_id: int
def __init__(self, *args, **kwargs):
placeholder = None
if 'author_placeholder' in kwargs:
placeholder = kwargs.pop('author_placeholder')
super().__init__(*args, **kwargs)
if placeholder:
self.fields['author'].widget.attrs.update({'placeholder': placeholder})
class Meta:
model = Version
fields = ['label', 'slug', 'body', 'author']

41
recipes/templates/add-recipe.html
View file

@ -1,41 +0,0 @@
{% extends "base_main.html" %}
{% block title %}{{ recipe.title }}{% endblock %}
{% block main %}
<form action="" method="post" id="add-version-form">
{%csrf_token %}
{{ recipe_form.as_div }}
<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("#add-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 %}

2
recipes/templates/recipes.html
View file

@ -3,7 +3,7 @@
{% block main %}
<h1>Recipes</h1>
{% if perms.recipes.add_recipe %}
<p><a href="{% url 'add-recipe' %}">Add recipe</a></p>
<p><a href="#">Add recipe</a></p>
{% endif %}
{% if perms.recipes.view_recipe %}
<ul>

1
recipes/urls.py
View file

@ -3,7 +3,6 @@ from . import views
urlpatterns = [
path('', views.recipes, name='recipes'),
path('add-recipe/', views.add_recipe, name='add-recipe'),
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'),

41
recipes/views.py
View file

@ -1,6 +1,6 @@
from django.shortcuts import render, get_object_or_404
from .models import Recipe, Version, Ingredient
from .forms import RecipeForm, VersionForm, IngredientFormSet
from .forms import VersionForm, IngredientFormSet
from django.contrib.auth.decorators import login_required, permission_required
from django.urls import reverse
from django.http.response import HttpResponseRedirect
@ -36,36 +36,8 @@ def recipe(request, slug):
else:
return render(request, 'recipe.html', context={'recipe': recipe, 'versions': versions})
RECIPE_FORM_PREFIX = 'recipe'
VERSION_FORM_PREFIX = 'version'
INGREDIENTS_FORMSET_PREFIX = 'ingredient' # TODO refactor author_placeholder argument
@login_required
def add_recipe(request):
if request.method == 'POST':
recipe_form = RecipeForm(request.POST, prefix=RECIPE_FORM_PREFIX)
version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
ingredients_formset = IngredientFormSet(request.POST, queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
if recipe_form.is_valid() and version_form.is_valid() and ingredients_formset.is_valid():
recipe = recipe_form.save(commit=True)
version = version_form.save(commit=False)
version.user = request.user
version.recipe = recipe
version.save()
for ingredient in ingredients_formset.save(commit=False):
ingredient.version = version
ingredient.save()
return HttpResponseRedirect(reverse('recipe', kwargs={'slug': recipe.slug}))
else:
recipe_form = RecipeForm(prefix=RECIPE_FORM_PREFIX)
version_form = VersionForm(prefix=VERSION_FORM_PREFIX, author_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)
return render(request, 'add-recipe.html', {'recipe_form': recipe_form, 'version_form': version_form, 'ingredients_formset': ingredients_formset})
INGREDIENTS_FORMSET_PREFIX = 'ingredient'
@login_required
@permission_required('recipes.add_recipe')
@ -77,7 +49,7 @@ def add_version(request, slug_recipe):
version_initial = {}
if request.method == 'POST':
version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, initial=version_initial, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
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
@ -94,7 +66,8 @@ def add_version(request, slug_recipe):
return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
else:
version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=version_initial, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
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)
return render(request, 'add-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
@ -106,7 +79,7 @@ def edit_version(request, slug_recipe, slug_version):
version = get_object_or_404(Version, recipe=recipe, slug=slug_version)
if request.method == 'POST': # TODO refactor with add_version
version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, instance=version, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
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
@ -124,7 +97,7 @@ def edit_version(request, slug_recipe, slug_version):
return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
else:
version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX)
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})