Compare commits
No commits in common. "de2fb7dc9cb3d0b58f7fd417b7c19d5d3cb04c6d" and "0071f4aac74d0dbbdbf96997700ffddff4404afb" have entirely different histories.
de2fb7dc9c
...
0071f4aac7
|
|
@ -3,7 +3,6 @@
|
||||||
{% block main %}
|
{% block main %}
|
||||||
<h1>{{ recipe.title }}</h1>
|
<h1>{{ recipe.title }}</h1>
|
||||||
{% if perms.recipes.add_recipe %}
|
{% if perms.recipes.add_recipe %}
|
||||||
<p><a href="{% url 'edit-recipe' recipe.slug %}">Edit recipe name</a></p>
|
|
||||||
<p><a href="{% url 'add-version' recipe.slug %}">Add version</a></p>
|
<p><a href="{% url 'add-version' recipe.slug %}">Add version</a></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<ul>
|
<ul>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
<p><a href="{{ recipe.get_absolute_url }}">Show all versions</a></p>
|
<p><a href="{{ recipe.get_absolute_url }}">Show all versions</a></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if perms.recipes.add_recipe %}
|
{% if perms.recipes.add_recipe %}
|
||||||
<p><a href="{% url 'edit-recipe' recipe.slug %}">Edit recipe name</a></p>
|
|
||||||
<p><a href="{% url 'add-version' recipe.slug %}">Add version</a></p>
|
<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>
|
<p><a href="{% url 'edit-version' recipe.slug version.slug %}">Edit Version</a></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ urlpatterns = [
|
||||||
path('', views.recipes, name='recipes'),
|
path('', views.recipes, name='recipes'),
|
||||||
path('add-recipe/', views.add_recipe, name='add-recipe'),
|
path('add-recipe/', views.add_recipe, name='add-recipe'),
|
||||||
path('<slug:slug>/add-version/', views.add_version, name='add-version'),
|
path('<slug:slug>/add-version/', views.add_version, name='add-version'),
|
||||||
path('<slug:slug>/edit-recipe/', views.edit_recipe, name='edit-recipe'),
|
|
||||||
path('<slug:slug_recipe>/<slug:slug_version>/edit-version/', views.edit_version, name='edit-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_recipe>/<slug:slug_version>/', views.version, name='version'),
|
||||||
path('<slug:slug>/', views.recipe, name='recipe'),
|
path('<slug:slug>/', views.recipe, name='recipe'),
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ def recipe(request, slug):
|
||||||
|
|
||||||
RECIPE_FORM_PREFIX = 'recipe'
|
RECIPE_FORM_PREFIX = 'recipe'
|
||||||
VERSION_FORM_PREFIX = 'version'
|
VERSION_FORM_PREFIX = 'version'
|
||||||
INGREDIENTS_FORMSET_PREFIX = 'ingredient'
|
INGREDIENTS_FORMSET_PREFIX = 'ingredient' # TODO refactor author_placeholder argument
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def add_recipe(request):
|
def add_recipe(request):
|
||||||
|
|
@ -69,21 +69,6 @@ def add_recipe(request):
|
||||||
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})
|
||||||
# TODO refactor Recipe.objects.get ... with get_object_or_404
|
|
||||||
@login_required
|
|
||||||
def edit_recipe(request, slug):
|
|
||||||
recipe = get_object_or_404(Recipe, slug=slug)
|
|
||||||
|
|
||||||
if request.method == 'POST':
|
|
||||||
form = RecipeForm(request.POST, instance=recipe, prefix=RECIPE_FORM_PREFIX)
|
|
||||||
if form.is_valid():
|
|
||||||
if form.has_changed():
|
|
||||||
form.save()
|
|
||||||
return HttpResponseRedirect(reverse('recipe', kwargs={'slug': recipe.slug}))
|
|
||||||
else:
|
|
||||||
form = RecipeForm(instance=recipe, prefix=RECIPE_FORM_PREFIX)
|
|
||||||
|
|
||||||
return render(request, 'edit-recipe.html', {'form': form})
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required('recipes.add_recipe')
|
@permission_required('recipes.add_recipe')
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue