space stuff partially working

cookbook/views/new.py

@@ -25,12 +25,11 @@ class RecipeCreate(GroupRequiredMixin, CreateView):
     def form_valid(self, form):
         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())
-        return HttpResponseRedirect(
-            reverse('edit_recipe', kwargs={'pk': obj.pk})
-        )
+        return HttpResponseRedirect(reverse('edit_recipe', kwargs={'pk': obj.pk}))
 
     def get_success_url(self):
         return reverse('edit_recipe', kwargs={'pk': self.object.pk})
@@ -43,11 +42,9 @@ class RecipeCreate(GroupRequiredMixin, CreateView):
 
 @group_required('user')
 def share_link(request, pk):
-    recipe = get_object_or_404(Recipe, pk=pk)
-    link = ShareLink.objects.create(recipe=recipe, created_by=request.user)
-    return HttpResponseRedirect(
-        reverse('view_recipe', kwargs={'pk': pk, 'share': link.uuid})
-    )
+    recipe = get_object_or_404(Recipe, pk=pk, space=request.space)
+    link = ShareLink.objects.create(recipe=recipe, created_by=request.user, space=request.space)
+    return HttpResponseRedirect(reverse('view_recipe', kwargs={'pk': pk, 'share': link.uuid}))
 
 
 class KeywordCreate(GroupRequiredMixin, CreateView):
@@ -57,6 +54,12 @@ class KeywordCreate(GroupRequiredMixin, CreateView):
     form_class = KeywordForm
     success_url = reverse_lazy('list_keyword')
 
+    def form_valid(self, form):
+        obj = form.save(commit=False)
+        obj.space = self.request.space
+        obj.save()
+        return HttpResponseRedirect(reverse('edit_keyword', kwargs={'pk': obj.pk}))
+
     def get_context_data(self, **kwargs):
         context = super(KeywordCreate, self).get_context_data(**kwargs)
         context['title'] = _("Keyword")
@@ -73,10 +76,9 @@ class StorageCreate(GroupRequiredMixin, CreateView):
     def form_valid(self, form):
         obj = form.save(commit=False)
         obj.created_by = self.request.user
+        obj.space = self.request.space
         obj.save()
-        return HttpResponseRedirect(
-            reverse('edit_storage', kwargs={'pk': obj.pk})
-        )
+        return HttpResponseRedirect(reverse('edit_storage', kwargs={'pk': obj.pk}))
 
     def get_context_data(self, **kwargs):
         context = super(StorageCreate, self).get_context_data(**kwargs)
@@ -89,8 +91,9 @@ def create_new_external_recipe(request, import_id):
     if request.method == "POST":
         form = ImportRecipeForm(request.POST)
         if form.is_valid():
-            new_recipe = RecipeImport.objects.get(id=import_id)
+            new_recipe = get_object_or_404(RecipeImport, pk=import_id, space=request.space)
             recipe = Recipe()
+            recipe.space = request.space
             recipe.storage = new_recipe.storage
             recipe.name = form.cleaned_data['name']
             recipe.file_path = form.cleaned_data['file_path']
@@ -101,20 +104,14 @@ def create_new_external_recipe(request, import_id):
 
             recipe.keywords.set(form.cleaned_data['keywords'])
 
-            RecipeImport.objects.get(id=import_id).delete()
+            new_recipe.delete()
 
-            messages.add_message(
-                request, messages.SUCCESS, _('Imported new recipe!')
-            )
+            messages.add_message(request, messages.SUCCESS, _('Imported new recipe!'))
             return redirect('list_recipe_import')
         else:
-            messages.add_message(
-                request,
-                messages.ERROR,
-                _('There was an error importing this recipe!')
-            )
+            messages.add_message(request, messages.ERROR, _('There was an error importing this recipe!'))
     else:
-        new_recipe = RecipeImport.objects.get(id=import_id)
+        new_recipe = get_object_or_404(RecipeImport, pk=import_id, space=request.space)
         form = ImportRecipeForm(
             initial={
                 'file_path': new_recipe.file_path,
@@ -136,6 +133,7 @@ class RecipeBookCreate(GroupRequiredMixin, CreateView):
     def form_valid(self, form):
         obj = form.save(commit=False)
         obj.created_by = self.request.user
+        obj.space = self.request.space
         obj.save()
         return HttpResponseRedirect(reverse('view_books'))
 
@@ -154,9 +152,7 @@ class MealPlanCreate(GroupRequiredMixin, CreateView):
 
     def get_form(self, form_class=None):
         form = self.form_class(**self.get_form_kwargs())
-        form.fields['meal_type'].queryset = MealType.objects.filter(
-            created_by=self.request.user
-        ).all()
+        form.fields['meal_type'].queryset = MealType.objects.filter(created_by=self.request.user, space=self.request.space).all()
         return form
 
     def get_initial(self):
@@ -181,6 +177,7 @@ class MealPlanCreate(GroupRequiredMixin, CreateView):
     def form_valid(self, form):
         obj = form.save(commit=False)
         obj.created_by = self.request.user
+        obj.space = self.request.space
         obj.save()
         return HttpResponseRedirect(reverse('view_plan'))
 
@@ -191,8 +188,8 @@ class MealPlanCreate(GroupRequiredMixin, CreateView):
         recipe = self.request.GET.get('recipe')
         if recipe:
             if re.match(r'^([0-9])+$', recipe):
-                if Recipe.objects.filter(pk=int(recipe)).exists():
-                    context['default_recipe'] = Recipe.objects.get(pk=int(recipe))  # noqa: E501
+                if Recipe.objects.filter(pk=int(recipe), space=self.request.space).exists():
+                    context['default_recipe'] = Recipe.objects.get(pk=int(recipe), space=self.request.space)
 
         return context
 
@@ -206,6 +203,7 @@ class InviteLinkCreate(GroupRequiredMixin, CreateView):
     def form_valid(self, form):
         obj = form.save(commit=False)
         obj.created_by = self.request.user
+        obj.space = self.request.space
         obj.save()
         return HttpResponseRedirect(reverse('list_invite_link'))