removed old shopping list

cookbook/views/lists.py

@@ -1,14 +1,13 @@
 from datetime import datetime
 
-from django.db.models import Q, Sum
+from django.db.models import Sum
 from django.shortcuts import render
 from django.utils.translation import gettext as _
 from django_tables2 import RequestConfig
 
-from cookbook.filters import ShoppingListFilter
 from cookbook.helper.permission_helper import group_required
-from cookbook.models import InviteLink, RecipeImport, ShoppingList, Storage, SyncLog, UserFile
-from cookbook.tables import (ImportLogTable, InviteLinkTable, RecipeImportTable, ShoppingListTable,
+from cookbook.models import InviteLink, RecipeImport, Storage, SyncLog, UserFile
+from cookbook.tables import (ImportLogTable, InviteLinkTable, RecipeImportTable,
                              StorageTable)
 
 
@@ -41,20 +40,12 @@ def recipe_import(request):
 
 @group_required('user')
 def shopping_list(request):
-    f = ShoppingListFilter(request.GET, queryset=ShoppingList.objects.filter(space=request.space).filter(
-        Q(created_by=request.user) | Q(shared=request.user)).distinct().all().order_by('finished', 'created_at'))
-
-    table = ShoppingListTable(f.qs)
-    RequestConfig(request, paginate={'per_page': 25}).configure(table)
-
     return render(
         request,
-        'generic/list_template.html',
+        'shoppinglist_template.html',
         {
-            'title': _("Shopping Lists"),
-            'table': table,
-            'filter': f,
-            'create_url': 'view_shopping'
+            "title": _("Shopping List"),
+
         }
     )
 
@@ -205,7 +196,7 @@ def custom_filter(request):
 def user_file(request):
     try:
         current_file_size_mb = UserFile.objects.filter(space=request.space).aggregate(Sum('file_size_kb'))[
-            'file_size_kb__sum'] / 1000
+                                   'file_size_kb__sum'] / 1000
     except TypeError:
         current_file_size_mb = 0
 
@@ -237,15 +228,3 @@ def step(request):
             }
         }
     )
-
-
-@group_required('user')
-def shopping_list_new(request):
-    return render(
-        request,
-        'shoppinglist_template.html',
-        {
-            "title": _("New Shopping List"),
-
-        }
-    )

cookbook/views/views.py

@@ -11,9 +11,9 @@ from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.models import Group
 from django.contrib.auth.password_validation import validate_password
 from django.core.exceptions import ValidationError
-from django.db.models import Avg, Q, Sum
+from django.db.models import Avg, Q
 from django.db.models.functions import Lower
-from django.http import HttpResponseRedirect, JsonResponse
+from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
@@ -27,9 +27,9 @@ from cookbook.forms import (CommentForm, Recipe, SearchPreferenceForm, ShoppingP
                             SpaceCreateForm, SpaceJoinForm, SpacePreferenceForm, User,
                             UserCreateForm, UserNameForm, UserPreference, UserPreferenceForm)
 from cookbook.helper.permission_helper import group_required, has_group_permission, share_link_valid
-from cookbook.models import (Comment, CookLog, Food, FoodInheritField, InviteLink, Keyword,
+from cookbook.models import (Comment, CookLog, Food, InviteLink, Keyword,
                              MealPlan, RecipeImport, SearchFields, SearchPreference, ShareLink,
-                             ShoppingList, Space, Unit, UserFile, ViewLog)
+                             Space, Unit, ViewLog)
 from cookbook.tables import (CookLogTable, InviteLinkTable, RecipeTable, RecipeTableSmall,
                              ViewLogTable)
 from cookbook.views.data import Object
@@ -256,35 +256,6 @@ def meal_plan_entry(request, pk):
     return render(request, 'meal_plan_entry.html', {'plan': plan, 'same_day_plan': same_day_plan})
 
 
-@group_required('user')
-def latest_shopping_list(request):
-    sl = ShoppingList.objects.filter(Q(created_by=request.user) | Q(shared=request.user)).filter(finished=False,
-                                                                                                 space=request.space).order_by(
-        '-created_at').first()
-
-    if sl:
-        return HttpResponseRedirect(reverse('view_shopping', kwargs={'pk': sl.pk}) + '?edit=true')
-    else:
-        return HttpResponseRedirect(reverse('view_shopping') + '?edit=true')
-
-
-@group_required('user')
-def shopping_list(request, pk=None):  # TODO deprecate
-    html_list = request.GET.getlist('r')
-
-    recipes = []
-    for r in html_list:
-        r = r.replace('[', '').replace(']', '')
-        if len(r) < 10000 and re.match(r'^([0-9])+,([0-9])+[.]*([0-9])*$', r):
-            rid, multiplier = r.split(',')
-            if recipe := Recipe.objects.filter(pk=int(rid), space=request.space).first():
-                recipes.append({'recipe': recipe.id, 'multiplier': multiplier})
-
-    edit = True if 'edit' in request.GET and request.GET['edit'] == 'true' else False
-
-    return render(request, 'shopping_list.html', {'shopping_list_id': pk, 'recipes': recipes, 'edit': edit})
-
-
 @group_required('guest')
 def user_settings(request):
     if request.space.demo: