diff --git a/cookbook/views/delete.py b/cookbook/views/delete.py index 411eb323c..788e386aa 100644 --- a/cookbook/views/delete.py +++ b/cookbook/views/delete.py @@ -8,8 +8,7 @@ from django.utils.translation import gettext as _ from django.views.generic import DeleteView from cookbook.helper.permission_helper import GroupRequiredMixin, OwnerRequiredMixin, group_required -from cookbook.models import (Comment, InviteLink, MealPlan, Recipe, RecipeBook, RecipeBookEntry, - RecipeImport, Space, Storage, Sync, UserSpace) +from cookbook.models import Comment, InviteLink, Recipe, RecipeImport, Space, Storage, Sync, UserSpace from cookbook.provider.dropbox import Dropbox from cookbook.provider.local import Local from cookbook.provider.nextcloud import Nextcloud @@ -114,11 +113,9 @@ class StorageDelete(GroupRequiredMixin, DeleteView): try: return self.delete(request, *args, **kwargs) except ProtectedError: - messages.add_message( - request, - messages.WARNING, - _('Could not delete this storage backend as it is used in at least one monitor.') # noqa: E501 - ) + messages.add_message(request, messages.WARNING, + _('Could not delete this storage backend as it is used in at least one monitor.') # noqa: E501 + ) return HttpResponseRedirect(reverse('list_storage')) @@ -133,40 +130,6 @@ class CommentDelete(OwnerRequiredMixin, DeleteView): return context -class RecipeBookDelete(OwnerRequiredMixin, DeleteView): - template_name = "generic/delete_template.html" - model = RecipeBook - success_url = reverse_lazy('view_books') - - def get_context_data(self, **kwargs): - context = super(RecipeBookDelete, self).get_context_data(**kwargs) - context['title'] = _("Recipe Book") - return context - - -class RecipeBookEntryDelete(OwnerRequiredMixin, DeleteView): - groups_required = ['user'] - template_name = "generic/delete_template.html" - model = RecipeBookEntry - success_url = reverse_lazy('view_books') - - def get_context_data(self, **kwargs): - context = super(RecipeBookEntryDelete, self).get_context_data(**kwargs) - context['title'] = _("Bookmarks") - return context - - -class MealPlanDelete(OwnerRequiredMixin, DeleteView): - template_name = "generic/delete_template.html" - model = MealPlan - success_url = reverse_lazy('view_plan') - - def get_context_data(self, **kwargs): - context = super(MealPlanDelete, self).get_context_data(**kwargs) - context['title'] = _("Meal-Plan") - return context - - class InviteLinkDelete(OwnerRequiredMixin, DeleteView): template_name = "generic/delete_template.html" model = InviteLink diff --git a/cookbook/views/new.py b/cookbook/views/new.py index d4368f67b..e2cbaad02 100644 --- a/cookbook/views/new.py +++ b/cookbook/views/new.py @@ -1,4 +1,3 @@ - from django.contrib import messages from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render @@ -7,40 +6,11 @@ from django.utils.translation import gettext as _ from django.views.generic import CreateView from cookbook.forms import ImportRecipeForm, Storage, StorageForm -from cookbook.helper.permission_helper import GroupRequiredMixin, above_space_limit, group_required -from cookbook.models import Recipe, RecipeImport, ShareLink, Step +from cookbook.helper.permission_helper import GroupRequiredMixin, group_required +from cookbook.models import Recipe, RecipeImport, ShareLink from recipes import settings -class RecipeCreate(GroupRequiredMixin, CreateView): - groups_required = ['user'] - template_name = "generic/new_template.html" - model = Recipe - fields = ('name',) - - def form_valid(self, form): - limit, msg = above_space_limit(self.request.space) - if limit: - messages.add_message(self.request, messages.WARNING, msg) - return HttpResponseRedirect(reverse('index')) - - obj = form.save(commit=False) - obj.created_by = self.request.user - obj.space = self.request.space - obj.internal = True - obj.save() - obj.steps.add(Step.objects.create(space=self.request.space, show_as_header=False, show_ingredients_table=self.request.user.userpreference.show_step_ingredients)) - return HttpResponseRedirect(reverse('edit_recipe', kwargs={'pk': obj.pk})) - - def get_success_url(self): - return reverse('edit_recipe', kwargs={'pk': self.object.pk}) - - def get_context_data(self, **kwargs): - context = super(RecipeCreate, self).get_context_data(**kwargs) - context['title'] = _("Recipe") - return context - - @group_required('user') def share_link(request, pk): recipe = get_object_or_404(Recipe, pk=pk, space=request.space) @@ -98,12 +68,6 @@ def create_new_external_recipe(request, import_id): messages.add_message(request, messages.ERROR, _('There was an error importing this recipe!')) else: new_recipe = get_object_or_404(RecipeImport, pk=import_id, space=request.space) - form = ImportRecipeForm( - initial={ - 'file_path': new_recipe.file_path, - 'name': new_recipe.name, - 'file_uid': new_recipe.file_uid - }, space=request.space - ) + form = ImportRecipeForm(initial={'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})