Compare commits

..

No commits in common. "21413af8d4bc85013c55824ac46250907acea149" and "3d2f97b50fd2d2611f921b684333f12e7a090284" have entirely different histories.

2 changed files with 9 additions and 1 deletions

View file

@ -14,6 +14,7 @@ def recipes(request):
recipes = Recipe.objects.all() recipes = Recipe.objects.all()
return render(request, 'recipes.html', context={'recipes': recipes}) return render(request, 'recipes.html', context={'recipes': recipes})
@login_required
def version(request, slug_recipe, slug_version): def version(request, slug_recipe, slug_version):
recipe = get_object_or_404(Recipe, slug=slug_recipe) recipe = get_object_or_404(Recipe, slug=slug_recipe)
has_multiple_versions = recipe.versions.all().count() > 1 # type: ignore has_multiple_versions = recipe.versions.all().count() > 1 # type: ignore
@ -28,7 +29,10 @@ def recipe(request, slug):
versions = recipe.versions.all() # type: ignore versions = recipe.versions.all() # type: ignore
if (1 == versions.count()): if (1 == versions.count()):
return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': slug, 'slug_version': versions.get().slug})) if settings.ENFORCE_RECIPE_VERSION_URL:
return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': slug, 'slug_version': versions.get().slug}))
else:
return version(request, slug, versions.get().slug)
else: else:
return render(request, 'recipe.html', context={'recipe': recipe, 'versions': versions}) return render(request, 'recipe.html', context={'recipe': recipe, 'versions': versions})

View file

@ -106,6 +106,10 @@ AUTH_PASSWORD_VALIDATORS = [
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = '/'
LOGOUT_REDIRECT_URL = '/' LOGOUT_REDIRECT_URL = '/'
# Recipes specific
ENFORCE_RECIPE_VERSION_URL = False
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/4.1/topics/i18n/ # https://docs.djangoproject.com/en/4.1/topics/i18n/