mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

forms

Browse Source
This commit is contained in:
vabene1111
2021-02-20 23:42:44 +01:00
parent 58c6077925
commit beb4aa634f
7 changed files with 107 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/views/data.py
View File

@@ -73,7 +73,7 @@ def batch_import(request):
@group_required('user')
def batch_edit(request):
if request.method == "POST":
form = BatchEditForm(request.POST)
form = BatchEditForm(request.POST, space=request.space)
if form.is_valid():
word = form.cleaned_data['search']
keywords = form.cleaned_data['keywords']
@@ -100,7 +100,7 @@ def batch_edit(request):
return redirect('data_batch_edit')
else:
form = BatchEditForm()
form = BatchEditForm(space=request.space)
return render(request, 'batch/edit.html', {'form': form})

45
cookbook/views/edit.py
View File

@@ -6,6 +6,7 @@ from django.shortcuts import get_object_or_404, render
from django.urls import reverse, reverse_lazy
from django.utils.translation import gettext as _
from django.views.generic import UpdateView
from django.views.generic.edit import FormMixin
from django_scopes import scopes_disabled
from cookbook.forms import (CommentForm, ExternalRecipeForm, FoodForm,
@@ -51,7 +52,15 @@ def internal_recipe_update(request, pk):
)
class SyncUpdate(GroupRequiredMixin, UpdateView):
class SpaceFormMixing(FormMixin):
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
kwargs.update({'space': self.request.space})
return kwargs
class SyncUpdate(GroupRequiredMixin, UpdateView, SpaceFormMixing):
groups_required = ['admin']
template_name = "generic/edit_template.html"
model = Sync
@@ -85,7 +94,7 @@ class KeywordUpdate(GroupRequiredMixin, UpdateView):
return context
class FoodUpdate(GroupRequiredMixin, UpdateView):
class FoodUpdate(GroupRequiredMixin, UpdateView, SpaceFormMixing):
groups_required = ['user']
template_name = "generic/edit_template.html"
model = Food
@@ -182,7 +191,7 @@ class ImportUpdate(GroupRequiredMixin, UpdateView):
return context
class RecipeBookUpdate(OwnerRequiredMixin, UpdateView):
class RecipeBookUpdate(OwnerRequiredMixin, UpdateView, SpaceFormMixing):
template_name = "generic/edit_template.html"
model = RecipeBook
form_class = RecipeBookForm
@@ -196,7 +205,7 @@ class RecipeBookUpdate(OwnerRequiredMixin, UpdateView):
return context
class MealPlanUpdate(OwnerRequiredMixin, UpdateView):
class MealPlanUpdate(OwnerRequiredMixin, UpdateView, SpaceFormMixing):
template_name = "generic/edit_template.html"
model = MealPlan
form_class = MealPlanForm
@@ -216,7 +225,7 @@ class MealPlanUpdate(OwnerRequiredMixin, UpdateView):
return context
class ExternalRecipeUpdate(GroupRequiredMixin, UpdateView):
class ExternalRecipeUpdate(GroupRequiredMixin, UpdateView, SpaceFormMixing):
groups_required = ['user']
model = Recipe
form_class = ExternalRecipeForm
@@ -226,8 +235,8 @@ class ExternalRecipeUpdate(GroupRequiredMixin, UpdateView):
self.object = form.save(commit=False)
old_recipe = Recipe.objects.get(pk=self.object.pk, space=self.request.space)
if not old_recipe.name == self.object.name:
# TODO central location to handle storage type switches
if self.object.storage.method == Storage.DROPBOX:
# TODO central location to handle storage type switches
Dropbox.rename_file(old_recipe, self.object.name)
if self.object.storage.method == Storage.NEXTCLOUD:
Nextcloud.rename_file(old_recipe, self.object.name)
@@ -240,24 +249,18 @@ class ExternalRecipeUpdate(GroupRequiredMixin, UpdateView):
os.path.splitext(self.object.file_path)[1]
)
messages.add_message(
self.request, messages.SUCCESS, _('Changes saved!')
)
messages.add_message(self.request, messages.SUCCESS, _('Changes saved!'))
return super(ExternalRecipeUpdate, self).form_valid(form)
def form_invalid(self, form):
messages.add_message(
self.request,
messages.ERROR,
_('Error saving changes!')
)
messages.add_message(self.request, messages.ERROR, _('Error saving changes!'))
return super(ExternalRecipeUpdate, self).form_valid(form)
def get_success_url(self):
return reverse('edit_recipe', kwargs={'pk': self.object.pk})
def get_context_data(self, **kwargs):
context = super(ExternalRecipeUpdate, self).get_context_data(**kwargs)
context = super().get_context_data(**kwargs)
context['title'] = _("Recipe")
context['view_url'] = reverse('view_recipe', args=[self.object.pk])
if self.object.storage:
@@ -271,7 +274,7 @@ class ExternalRecipeUpdate(GroupRequiredMixin, UpdateView):
def edit_ingredients(request):
if request.method == "POST":
success = False
units_form = UnitMergeForm(request.POST, prefix=UnitMergeForm.prefix)
units_form = UnitMergeForm(request.POST, prefix=UnitMergeForm.prefix, space=request.space)
if units_form.is_valid():
new_unit = units_form.cleaned_data['new_unit']
old_unit = units_form.cleaned_data['old_unit']
@@ -287,7 +290,7 @@ def edit_ingredients(request):
else:
messages.add_message(request, messages.ERROR, _('Cannot merge with the same object!'))
food_form = FoodMergeForm(request.POST, prefix=FoodMergeForm.prefix)
food_form = FoodMergeForm(request.POST, prefix=FoodMergeForm.prefix, space=request.space)
if food_form.is_valid():
new_food = food_form.cleaned_data['new_food']
old_food = food_form.cleaned_data['old_food']
@@ -304,10 +307,10 @@ def edit_ingredients(request):
messages.add_message(request, messages.ERROR, _('Cannot merge with the same object!'))
if success:
units_form = UnitMergeForm()
food_form = FoodMergeForm()
units_form = UnitMergeForm(space=request.space)
food_form = FoodMergeForm(space=request.space)
else:
units_form = UnitMergeForm()
food_form = FoodMergeForm()
units_form = UnitMergeForm(space=request.space)
food_form = FoodMergeForm(space=request.space)
return render(request, 'forms/ingredients.html', {'units_form': units_form, 'food_form': food_form})

6
cookbook/views/import_export.py
View File

@@ -49,7 +49,7 @@ def import_recipe(request):
@group_required('user')
def export_recipe(request):
if request.method == "POST":
form = ExportForm(request.POST, user=request.user)
form = ExportForm(request.POST, space=request.space)
if form.is_valid():
try:
integration = get_integration(request, form.cleaned_data['type'])
@@ -58,11 +58,11 @@ def export_recipe(request):
messages.add_message(request, messages.ERROR, _('Exporting is not implemented for this provider'))
else:
form = ExportForm(user=request.user)
form = ExportForm(space=request.space)
recipe = request.GET.get('r')
if recipe:
if re.match(r'^([0-9])+$', recipe):
if recipe := Recipe.objects.filter(pk=int(recipe), space=request.space).first():
form = ExportForm(initial={'recipes': recipe}, user=request.user)
form = ExportForm(initial={'recipes': recipe}, space=request.space)
return render(request, 'export.html', {'form': form})

9
cookbook/views/new.py
View File

@@ -14,6 +14,7 @@ from cookbook.helper.permission_helper import (GroupRequiredMixin,
group_required)
from cookbook.models import (InviteLink, Keyword, MealPlan, MealType, Recipe,
RecipeBook, RecipeImport, ShareLink, Step)
from cookbook.views.edit import SpaceFormMixing
class RecipeCreate(GroupRequiredMixin, CreateView):
@@ -89,7 +90,7 @@ class StorageCreate(GroupRequiredMixin, CreateView):
@group_required('user')
def create_new_external_recipe(request, import_id):
if request.method == "POST":
form = ImportRecipeForm(request.POST)
form = ImportRecipeForm(request.POST, space=request.space)
if form.is_valid():
new_recipe = get_object_or_404(RecipeImport, pk=import_id, space=request.space)
recipe = Recipe()
@@ -117,13 +118,13 @@ def create_new_external_recipe(request, import_id):
'file_path': new_recipe.file_path,
'name': new_recipe.name,
'file_uid': new_recipe.file_uid
}
}, space=request.space
)
return render(request, 'forms/edit_import_recipe.html', {'form': form})
class RecipeBookCreate(GroupRequiredMixin, CreateView):
class RecipeBookCreate(GroupRequiredMixin, CreateView, SpaceFormMixing):
groups_required = ['user']
template_name = "generic/new_template.html"
model = RecipeBook
@@ -143,7 +144,7 @@ class RecipeBookCreate(GroupRequiredMixin, CreateView):
return context
class MealPlanCreate(GroupRequiredMixin, CreateView):
class MealPlanCreate(GroupRequiredMixin, CreateView, SpaceFormMixing):
groups_required = ['user']
template_name = "generic/new_template.html"
model = MealPlan

2
cookbook/views/views.py
View File

@@ -129,7 +129,7 @@ def recipe_view(request, pk, share=None):
request, messages.SUCCESS, _('Comment saved!')
)
bookmark_form = RecipeBookEntryForm(request.POST, prefix='bookmark')
bookmark_form = RecipeBookEntryForm(request.POST, prefix='bookmark', space=request.space)
if bookmark_form.is_valid():
bookmark = RecipeBookEntry()
bookmark.recipe = recipe