From dde350c8afc72a9dbc4685e8e404ff5d3c0d441f Mon Sep 17 00:00:00 2001 From: smilerz Date: Mon, 17 Jan 2022 08:35:19 -0600 Subject: [PATCH] prettier cleanup --- cookbook/models.py | 80 ------------------------------ cookbook/templates/url_import.html | 6 +-- cookbook/views/api.py | 1 - recipes/settings.py | 2 +- 4 files changed, 4 insertions(+), 85 deletions(-) diff --git a/cookbook/models.py b/cookbook/models.py index ad50db1b..98027abf 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -1094,83 +1094,3 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis objects = ScopedManager(space='space') space = models.ForeignKey(Space, on_delete=models.CASCADE) - - -# class ModelFilter(models.Model): -# EQUAL = 'EQUAL' -# LESS_THAN = 'LESS_THAN' -# GREATER_THAN = 'GREATER_THAN' -# LESS_THAN_EQ = 'LESS_THAN_EQ' -# GREATER_THAN_EQ = 'GREATER_THAN_EQ' -# CONTAINS = 'CONTAINS' -# STARTS_WITH = 'STARTS_WITH' -# ENDS_WITH = 'ENDS_WITH' -# INCLUDES = 'INCLUDES' - -# OPERATION = ( -# (EQUAL, _('is')), -# (LESS_THAN, _('less than')), -# (GREATER_THAN, _('greater than')), -# (LESS_THAN_EQ, _('less or equal')), -# (GREATER_THAN_EQ, _('greater or equal')), -# (CONTAINS, _('contains')), -# (STARTS_WITH, _('starts with')), -# (INCLUDES, _('includes')), -# ) - -# STRING = 'STRING' -# NUMBER = 'NUMBER' -# BOOLEAN = 'BOOLEAN' -# DATE = 'DATE' - -# FIELD_TYPE = ( -# (STRING, _('string')), -# (NUMBER, _('number')), -# (BOOLEAN, _('boolean')), -# (DATE, _('date')), -# ) - -# field = models.CharField(max_length=32) -# field_type = models.CharField(max_length=32, choices=(FIELD_TYPE)) -# operation = models.CharField(max_length=32, choices=(OPERATION)) -# negate = models.BooleanField(default=False,) -# target_value = models.CharField(max_length=128) -# sort = models.BooleanField(default=False,) -# ascending = models.BooleanField(default=True,) - -# def __str__(self): -# return f"{self.field} - {self.operation} - {self.target_value}" - - -# class SavedFilter(models.Model, PermissionModelMixin): -# FOOD = 'FOOD' -# UNIT = 'UNIT' -# KEYWORD = "KEYWORD" -# RECIPE = 'RECIPE' -# BOOK = 'BOOK' - -# MODELS = ( -# (FOOD, _('Food')), -# (UNIT, _('Unit')), -# (KEYWORD, _('Keyword')), -# (RECIPE, _('Recipe')), -# (BOOK, _('Book')) -# ) - -# name = models.CharField(max_length=128, ) -# type = models.CharField(max_length=24, choices=(MODELS)), -# description = models.CharField(max_length=256, blank=True) -# shared = models.ManyToManyField(User, blank=True, related_name='filter_share') -# created_by = models.ForeignKey(User, on_delete=models.CASCADE) -# filter = models.ForeignKey(ModelFilter, on_delete=models.PROTECT, null=True) - -# objects = ScopedManager(space='space') -# space = models.ForeignKey(Space, on_delete=models.CASCADE) - -# def __str__(self): -# return f"{self.type}: {self.name}" - -# class Meta: -# constraints = [ -# models.UniqueConstraint(fields=['space', 'name'], name='sf_unique_name_per_space') -# ] diff --git a/cookbook/templates/url_import.html b/cookbook/templates/url_import.html index 933f744b..baf4f67d 100644 --- a/cookbook/templates/url_import.html +++ b/cookbook/templates/url_import.html @@ -499,7 +499,7 @@ :allow-empty="true" :preserve-search="true" :internal-search="false" - :limit="options_limit" + :limit="options_limit" placeholder="{% trans 'Select one' %}" tag-placeholder="{% trans 'Select' %}" label="text" @@ -539,7 +539,7 @@ :allow-empty="false" :preserve-search="true" :internal-search="false" - :limit="options_limit" + :limit="options_limit" label="text" track-by="id" :multiple="false" @@ -591,7 +591,7 @@ :hide-selected="true" :preserve-search="true" :internal-search="false" - :limit="options_limit" + :limit="options_limit" placeholder="{% trans 'Select one' %}" tag-placeholder="{% trans 'Add Keyword' %}" :taggable="true" diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 580942b2..9cc74015 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -653,7 +653,6 @@ class RecipeViewSet(viewsets.ModelViewSet): if not (share and self.detail): self.queryset = self.queryset.filter(space=self.request.space) - super().get_queryset() # self.queryset = search_recipes(self.request, self.queryset, self.request.GET) params = {x: self.request.GET.get(x) if len({**self.request.GET}[x]) == 1 else self.request.GET.getlist(x) for x in list(self.request.GET)} self.queryset = RecipeSearch(self.request, **params).get_queryset(self.queryset).prefetch_related('cooklog_set') diff --git a/recipes/settings.py b/recipes/settings.py index dcbbfc07..e5283271 100644 --- a/recipes/settings.py +++ b/recipes/settings.py @@ -258,7 +258,7 @@ WSGI_APPLICATION = 'recipes.wsgi.application' # Load settings from env files if os.getenv('DATABASE_URL'): match = re.match( - r'(?P\w+):\/\/(?P[\w\d_-]+)(:(?P[^@]+))?@(?P[^:/]+)(:(?P\d+))?(\/(?P[\w\d_-]+))?', + r'(?P\w+):\/\/(?P[\w\d_-]+)(:(?P[^@]+))?@(?P[^:/]+)(:(?P\d+))?(\/(?P[\w\d\/\._-]+))?', os.getenv('DATABASE_URL') ) settings = match.groupdict()