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

refactor author placeholder function

Browse source
This commit is contained in:
Benjamin 2023-03-05 19:24:58 +01:00
parent b6af65e915
commit 65052ed6e7
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
recipes/views.py
View file

@ -6,6 +6,9 @@ from django.urls import reverse
from django.http.response import HttpResponseRedirect from django.http.response import HttpResponseRedirect
from django.conf import settings from django.conf import settings
def get_name_of_user(user):
return user.first_name if user.first_name else user.username
@login_required @login_required
@permission_required('recipes.view_recipe') @permission_required('recipes.view_recipe')
def recipes(request): def recipes(request):
@ -44,7 +47,7 @@ INGREDIENTS_FORMSET_PREFIX = 'ingredient' # TODO refactor author_placeholder arg
def add_recipe(request): def add_recipe(request):
if request.method == 'POST': if request.method == 'POST':
recipe_form = RecipeForm(request.POST, prefix=RECIPE_FORM_PREFIX) 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) version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
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)
if recipe_form.is_valid() and version_form.is_valid() and ingredients_formset.is_valid(): if recipe_form.is_valid() and version_form.is_valid() and ingredients_formset.is_valid():
@ -62,7 +65,7 @@ def add_recipe(request):
return HttpResponseRedirect(reverse('recipe', kwargs={'slug': recipe.slug})) return HttpResponseRedirect(reverse('recipe', kwargs={'slug': recipe.slug}))
else: else:
recipe_form = RecipeForm(prefix=RECIPE_FORM_PREFIX) 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) version_form = VersionForm(prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX) 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}) return render(request, 'add-recipe.html', {'recipe_form': recipe_form, 'version_form': version_form, 'ingredients_formset': ingredients_formset})
@ -77,7 +80,7 @@ def add_version(request, slug_recipe):
version_initial = {} version_initial = {}
if request.method == 'POST': 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, author_placeholder=get_name_of_user(request.user))
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
@ -94,7 +97,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:
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, author_placeholder=get_name_of_user(request.user))
ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), 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}) return render(request, 'add-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
@ -106,7 +109,7 @@ def edit_version(request, slug_recipe, slug_version):
version = get_object_or_404(Version, recipe=recipe, slug=slug_version) version = get_object_or_404(Version, recipe=recipe, slug=slug_version)
if request.method == 'POST': # TODO refactor with add_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, author_placeholder=get_name_of_user(request.user))
ingredients_formset = IngredientFormSet(request.POST, queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore ingredients_formset = IngredientFormSet(request.POST, queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
version_form.recipe_id = recipe.id # type: ignore version_form.recipe_id = recipe.id # type: ignore
@ -124,7 +127,7 @@ 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, author_placeholder=request.user.first_name if request.user.first_name else request.user.username) version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
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})