From 8f65ecfc18a299aed034a3f3b84a6faf12b15934 Mon Sep 17 00:00:00 2001 From: smilerz Date: Tue, 20 Feb 2024 17:14:55 -0600 Subject: [PATCH] remove dal autocomplete --- cookbook/helper/__init__.py | 2 -- cookbook/helper/dal.py | 34 ---------------------------------- cookbook/urls.py | 6 ------ 3 files changed, 42 deletions(-) delete mode 100644 cookbook/helper/dal.py diff --git a/cookbook/helper/__init__.py b/cookbook/helper/__init__.py index c1cb37885..7a7792027 100644 --- a/cookbook/helper/__init__.py +++ b/cookbook/helper/__init__.py @@ -1,6 +1,4 @@ -import cookbook.helper.dal from cookbook.helper.AllAuthCustomAdapter import AllAuthCustomAdapter __all__ = [ - 'dal', ] diff --git a/cookbook/helper/dal.py b/cookbook/helper/dal.py deleted file mode 100644 index 879279c88..000000000 --- a/cookbook/helper/dal.py +++ /dev/null @@ -1,34 +0,0 @@ -from cookbook.models import Food, Keyword, Recipe, Unit - -from dal import autocomplete - - -class BaseAutocomplete(autocomplete.Select2QuerySetView): - model = None - - def get_queryset(self): - if not self.request.user.is_authenticated: - return self.model.objects.none() - - qs = self.model.objects.filter(space=self.request.space).all() - - if self.q: - qs = qs.filter(name__icontains=self.q) - - return qs - - -class KeywordAutocomplete(BaseAutocomplete): - model = Keyword - - -class IngredientsAutocomplete(BaseAutocomplete): - model = Food - - -class RecipeAutocomplete(BaseAutocomplete): - model = Recipe - - -class UnitAutocomplete(BaseAutocomplete): - model = Unit diff --git a/cookbook/urls.py b/cookbook/urls.py index 6bd2c26df..5527249ef 100644 --- a/cookbook/urls.py +++ b/cookbook/urls.py @@ -5,7 +5,6 @@ from django.views.generic import TemplateView from rest_framework import permissions, routers from rest_framework.schemas import get_schema_view -from cookbook.helper import dal from cookbook.version_info import TANDOOR_VERSION from recipes.settings import DEBUG, PLUGINS @@ -136,11 +135,6 @@ urlpatterns = [ path('api/switch-active-space//', api.switch_active_space, name='api_switch_active_space'), path('api/download-file//', api.download_file, name='api_download_file'), - path('dal/keyword/', dal.KeywordAutocomplete.as_view(), name='dal_keyword'), - # TODO is this deprecated? not yet, some old forms remain, could likely be changed to generic API endpoints - path('dal/food/', dal.IngredientsAutocomplete.as_view(), name='dal_food'), # TODO is this deprecated? - path('dal/unit/', dal.UnitAutocomplete.as_view(), name='dal_unit'), # TODO is this deprecated? - path('telegram/setup/', telegram.setup_bot, name='telegram_setup'), path('telegram/remove/', telegram.remove_bot, name='telegram_remove'), path('telegram/hook//', telegram.hook, name='telegram_hook'),