Squashed commit of shoppinglist_v2

cookbook/views/api.py

@@ -402,7 +402,8 @@ class FoodInheritFieldViewSet(viewsets.ReadOnlyModelViewSet):
 
     def get_queryset(self):
         # exclude fields not yet implemented
-        return Food.inherit_fields
+        self.queryset = Food.inheritable_fields
+        return super().get_queryset()
 
 
 class FoodViewSet(viewsets.ModelViewSet, TreeMixin):

cookbook/views/import_export.py

@@ -11,6 +11,7 @@ from django.utils.translation import gettext as _
 from cookbook.forms import ExportForm, ImportForm, ImportExportBase
 from cookbook.helper.permission_helper import group_required
 from cookbook.integration.cookbookapp import CookBookApp
+from cookbook.integration.copymethat import CopyMeThat
 from cookbook.integration.pepperplate import Pepperplate
 from cookbook.integration.cheftap import ChefTap
 from cookbook.integration.chowdown import Chowdown
@@ -65,6 +66,8 @@ def get_integration(request, export_type):
         return Plantoeat(request, export_type)
     if export_type == ImportExportBase.COOKBOOKAPP:
         return CookBookApp(request, export_type)
+    if export_type == ImportExportBase.COPYMETHAT:
+        return CopyMeThat(request, export_type)
 
 
 @group_required('user')

cookbook/views/new.py

@@ -201,7 +201,10 @@ 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
+
+        # verify given space is actually owned by the user creating the link
+        if obj.space.created_by != self.request.user:
+            obj.space = self.request.space
         obj.save()
         if obj.email:
             try:

cookbook/views/views.py

@@ -561,7 +561,7 @@ def space(request):
 
     space_form = SpacePreferenceForm(instance=request.space)
 
-    space_form.base_fields['food_inherit'].queryset = Food.inherit_fields
+    space_form.base_fields['food_inherit'].queryset = Food.inheritable_fields
     if request.method == "POST" and 'space_form' in request.POST:
         form = SpacePreferenceForm(request.POST, prefix='space')
         if form.is_valid():