From 4e8bbefc1707de5800ec3ccb99a358ee3fc7acc1 Mon Sep 17 00:00:00 2001 From: smilerz Date: Tue, 15 Feb 2022 06:42:57 -0600 Subject: [PATCH] minor cleanup --- cookbook/helper/recipe_search.py | 1 - cookbook/helper/template_helper.py | 9 ++++++--- cookbook/managers.py | 4 +--- cookbook/models.py | 1 + cookbook/views/delete.py | 9 +++------ cookbook/views/edit.py | 16 +++++----------- cookbook/views/import_export.py | 18 +++++++++--------- cookbook/views/new.py | 12 +++++------- cookbook/views/telegram.py | 2 +- cookbook/views/views.py | 1 + .../apps/RecipeSearchView/RecipeSearchView.vue | 1 - vue/src/components/CookbookEditCard.vue | 1 - 12 files changed, 32 insertions(+), 43 deletions(-) diff --git a/cookbook/helper/recipe_search.py b/cookbook/helper/recipe_search.py index 5b254572..da4268c9 100644 --- a/cookbook/helper/recipe_search.py +++ b/cookbook/helper/recipe_search.py @@ -128,7 +128,6 @@ class RecipeSearch(): self.unit_filters(units=self._units) self._makenow_filter(missing=self._makenow) self.string_filters(string=self._string) - return self._queryset.filter(space=self._request.space).distinct().order_by(*self.orderby) def _sort_includes(self, *args): diff --git a/cookbook/helper/template_helper.py b/cookbook/helper/template_helper.py index 6ab9d344..fc94cc89 100644 --- a/cookbook/helper/template_helper.py +++ b/cookbook/helper/template_helper.py @@ -1,11 +1,14 @@ +from gettext import gettext as _ + import bleach import markdown as md from bleach_allowlist import markdown_attrs, markdown_tags +from jinja2 import Template, TemplateSyntaxError, UndefinedError +from markdown.extensions.tables import TableExtension + from cookbook.helper.mdx_attributes import MarkdownFormatExtension from cookbook.helper.mdx_urlize import UrlizeExtension -from jinja2 import Template, TemplateSyntaxError, UndefinedError -from gettext import gettext as _ -from markdown.extensions.tables import TableExtension + class IngredientObject(object): amount = "" diff --git a/cookbook/managers.py b/cookbook/managers.py index 76b01f96..636ed896 100644 --- a/cookbook/managers.py +++ b/cookbook/managers.py @@ -1,7 +1,5 @@ from django.contrib.postgres.aggregates import StringAgg -from django.contrib.postgres.search import ( - SearchQuery, SearchRank, SearchVector, -) +from django.contrib.postgres.search import SearchQuery, SearchRank, SearchVector from django.db import models from django.db.models import Q from django.utils import translation diff --git a/cookbook/models.py b/cookbook/models.py index 2cf87307..1456fb82 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -481,6 +481,7 @@ class Unit(ExportModelOperationsMixin('unit'), models.Model, PermissionModelMixi class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin): + # TODO when savings a food as substitute children - assume children and descednants are also substitutes for siblings # exclude fields not implemented yet inheritable_fields = FoodInheritField.objects.exclude(field__in=['diet', 'substitute', ]) # TODO add inherit children_inherit, parent_inherit, Do Not Inherit diff --git a/cookbook/views/delete.py b/cookbook/views/delete.py index 55b5ab2b..6b94298c 100644 --- a/cookbook/views/delete.py +++ b/cookbook/views/delete.py @@ -7,12 +7,9 @@ from django.urls import reverse, reverse_lazy from django.utils.translation import gettext as _ from django.views.generic import DeleteView -from cookbook.helper.permission_helper import (GroupRequiredMixin, - OwnerRequiredMixin, - group_required) -from cookbook.models import (Comment, InviteLink, MealPlan, Recipe, - RecipeBook, RecipeBookEntry, RecipeImport, - Storage, Sync) +from cookbook.helper.permission_helper import GroupRequiredMixin, OwnerRequiredMixin, group_required +from cookbook.models import (Comment, InviteLink, MealPlan, Recipe, RecipeBook, RecipeBookEntry, + RecipeImport, Storage, Sync) from cookbook.provider.dropbox import Dropbox from cookbook.provider.local import Local from cookbook.provider.nextcloud import Nextcloud diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py index d2575638..ff313466 100644 --- a/cookbook/views/edit.py +++ b/cookbook/views/edit.py @@ -2,22 +2,16 @@ import os from django.contrib import messages from django.http import HttpResponseRedirect -from django.shortcuts import get_object_or_404, render, redirect +from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.translation import gettext as _ from django.views.generic import UpdateView from django.views.generic.edit import FormMixin -from cookbook.forms import (CommentForm, ExternalRecipeForm, - MealPlanForm, - StorageForm, SyncForm, - ) -from cookbook.helper.permission_helper import (GroupRequiredMixin, - OwnerRequiredMixin, - group_required) -from cookbook.models import (Comment, MealPlan, - MealType, Recipe, RecipeImport, - Storage, Sync, UserPreference) +from cookbook.forms import CommentForm, ExternalRecipeForm, MealPlanForm, StorageForm, SyncForm +from cookbook.helper.permission_helper import GroupRequiredMixin, OwnerRequiredMixin, group_required +from cookbook.models import (Comment, MealPlan, MealType, Recipe, RecipeImport, Storage, Sync, + UserPreference) from cookbook.provider.dropbox import Dropbox from cookbook.provider.local import Local from cookbook.provider.nextcloud import Nextcloud diff --git a/cookbook/views/import_export.py b/cookbook/views/import_export.py index 1974c18d..f4aea7c0 100644 --- a/cookbook/views/import_export.py +++ b/cookbook/views/import_export.py @@ -1,21 +1,20 @@ import re import threading from io import BytesIO -from django.core.cache import cache from django.contrib import messages +from django.core.cache import cache from django.http import HttpResponse, HttpResponseRedirect, JsonResponse -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import get_object_or_404, render from django.urls import reverse from django.utils.translation import gettext as _ -from cookbook.forms import ExportForm, ImportForm, ImportExportBase +from cookbook.forms import ExportForm, ImportExportBase, ImportForm 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 +from cookbook.integration.cookbookapp import CookBookApp +from cookbook.integration.copymethat import CopyMeThat from cookbook.integration.default import Default from cookbook.integration.domestica import Domestica from cookbook.integration.mealie import Mealie @@ -23,14 +22,15 @@ from cookbook.integration.mealmaster import MealMaster from cookbook.integration.nextcloud_cookbook import NextcloudCookbook from cookbook.integration.openeats import OpenEats from cookbook.integration.paprika import Paprika +from cookbook.integration.pdfexport import PDFexport +from cookbook.integration.pepperplate import Pepperplate from cookbook.integration.plantoeat import Plantoeat -from cookbook.integration.recipekeeper import RecipeKeeper from cookbook.integration.recettetek import RecetteTek +from cookbook.integration.recipekeeper import RecipeKeeper from cookbook.integration.recipesage import RecipeSage from cookbook.integration.rezkonv import RezKonv from cookbook.integration.saffron import Saffron -from cookbook.integration.pdfexport import PDFexport -from cookbook.models import Recipe, ImportLog, ExportLog, UserPreference +from cookbook.models import ExportLog, ImportLog, Recipe, UserPreference from recipes import settings diff --git a/cookbook/views/new.py b/cookbook/views/new.py index 382ba2ab..e683b816 100644 --- a/cookbook/views/new.py +++ b/cookbook/views/new.py @@ -5,19 +5,17 @@ from smtplib import SMTPException from django.contrib import messages from django.contrib.auth.models import Group -from django.core.mail import send_mail, BadHeaderError +from django.core.mail import BadHeaderError, send_mail 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.translation import gettext as _ from django.views.generic import CreateView -from cookbook.forms import (ImportRecipeForm, InviteLinkForm, - MealPlanForm, Storage, StorageForm) -from cookbook.helper.permission_helper import (GroupRequiredMixin, - group_required) -from cookbook.models import (InviteLink, MealPlan, MealType, Recipe, - RecipeBook, RecipeImport, ShareLink, Step, UserPreference) +from cookbook.forms import ImportRecipeForm, InviteLinkForm, MealPlanForm, Storage, StorageForm +from cookbook.helper.permission_helper import GroupRequiredMixin, group_required +from cookbook.models import (InviteLink, MealPlan, MealType, Recipe, RecipeBook, RecipeImport, + ShareLink, Step, UserPreference) from cookbook.views.edit import SpaceFormMixing from recipes import settings diff --git a/cookbook/views/telegram.py b/cookbook/views/telegram.py index 6c98bdf0..d76b9f9e 100644 --- a/cookbook/views/telegram.py +++ b/cookbook/views/telegram.py @@ -8,7 +8,7 @@ from django.views.decorators.csrf import csrf_exempt from cookbook.helper.ingredient_parser import IngredientParser from cookbook.helper.permission_helper import group_required -from cookbook.models import TelegramBot, ShoppingList, ShoppingListEntry +from cookbook.models import ShoppingList, ShoppingListEntry, TelegramBot @group_required('user') diff --git a/cookbook/views/views.py b/cookbook/views/views.py index 23d2fe8a..26d80f6b 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -12,6 +12,7 @@ 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.functions import Lower from django.http import HttpResponseRedirect, JsonResponse from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse, reverse_lazy diff --git a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue index 60408a4f..bd839588 100644 --- a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue +++ b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue @@ -892,7 +892,6 @@ export default { // TODO: figure out how to find nested items and load keyword/food children for that branch // probably a backend change in facets to pre-load children of nested items - for (let x of this.search.search_foods.map((x) => x.items).flat()) { this.facets.Foods.push({ id: x, name: "loading..." }) } diff --git a/vue/src/components/CookbookEditCard.vue b/vue/src/components/CookbookEditCard.vue index a1043c6e..860ca364 100644 --- a/vue/src/components/CookbookEditCard.vue +++ b/vue/src/components/CookbookEditCard.vue @@ -110,7 +110,6 @@ export default { }, saveData: function () { let apiClient = new ApiApiFactory() - console.log(this.book_copy) apiClient .updateRecipeBook(this.book_copy.id, this.book_copy)