Fix after rebase

cookbook/helper/recipe_search.py

@@ -29,9 +29,10 @@ def search_recipes(request, queryset, params):
     if search_last_viewed > 0:
         last_viewed_recipes = ViewLog.objects.filter(
             created_by=request.user, space=request.space,
-            created_at__gte=datetime.now() - timedelta(days=14)).values_list(
-            'recipe__pk', flat=True).distinct()
-        return queryset.filter(pk__in=list(set(last_viewed_recipes))[-search_last_viewed:])
+            created_at__gte=datetime.now() - timedelta(days=14)
+        ).order_by('pk').values_list('recipe__pk', flat=True).distinct()
+
+        return queryset.filter(pk__in=last_viewed_recipes[len(last_viewed_recipes) - min(len(last_viewed_recipes), search_last_viewed):])
 
     queryset = queryset.annotate(
         new_recipe=Case(When(

cookbook/models.py

@@ -393,7 +393,7 @@ class NutritionInformation(models.Model, PermissionModelMixin):
         return 'Nutrition'
 
 
-class Recipe(models.Model, PermissionModelMixin):
+class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModelMixin):
     name = models.CharField(max_length=128)
     description = models.CharField(max_length=512, blank=True, null=True)
     servings = models.IntegerField(default=1)

cookbook/views/api.py

@@ -190,6 +190,16 @@ class SupermarketViewSet(viewsets.ModelViewSet, StandardFilterMixin):
         return super().get_queryset()
 
 
+class SupermarketCategoryViewSet(viewsets.ModelViewSet, StandardFilterMixin):
+    queryset = SupermarketCategory.objects
+    serializer_class = SupermarketCategorySerializer
+    permission_classes = [CustomIsUser]
+
+    def get_queryset(self):
+        self.queryset = self.queryset.filter(space=self.request.space)
+        return super().get_queryset()
+
+
 class KeywordViewSet(viewsets.ModelViewSet, FuzzyFilterMixin):
     """
        list:

cookbook/views/views.py

@@ -33,7 +33,6 @@ from cookbook.models import (Comment, CookLog, InviteLink, MealPlan,
 from cookbook.tables import (CookLogTable, RecipeTable, RecipeTableSmall,
                              ViewLogTable)
 from cookbook.views.data import Object
-from recipes.settings import DEMO
 from recipes.version import BUILD_REF, VERSION_NUMBER