diff --git a/cookbook/helper/recipe_search.py b/cookbook/helper/recipe_search.py index e00d8ee6a..80ad18d62 100644 --- a/cookbook/helper/recipe_search.py +++ b/cookbook/helper/recipe_search.py @@ -196,11 +196,11 @@ def get_facet(qs, params, space): # if using an OR search, will annotate all keywords, otherwise, just those that appear in results if search_keywords_or: - foods = Food.objects.filter(ingredient__step__recipe__in=list(qs.values_list('id', flat=True),space=space])).annotate(recipe_count=Count('ingredient')) + foods = Food.objects.filter(ingredient__step__recipe__in=list(qs.values_list('id', flat=True),space=space)).annotate(recipe_count=Count('ingredient')) else: foods = Food.objects.filter(ingredient__step__recipe__in=list(qs.values_list('id', flat=True))).annotate(recipe_count=Count('ingredient')) food_a = annotated_qs(foods, root=True, fill=True) - + # TODO add rating facet facets['Ratings'] = [] diff --git a/cookbook/migrations/0149_fix_leading_trailing_spaces.py b/cookbook/migrations/0149_fix_leading_trailing_spaces.py index f52dfc856..779de6529 100644 --- a/cookbook/migrations/0149_fix_leading_trailing_spaces.py +++ b/cookbook/migrations/0149_fix_leading_trailing_spaces.py @@ -23,7 +23,7 @@ def backwards(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('cookbook', '0148_food_to_tree'), + ('cookbook', '0148_auto_20210813_1829'), ] operations = [ diff --git a/cookbook/migrations/0148_food_to_tree.py b/cookbook/migrations/0150_food_to_tree.py similarity index 96% rename from cookbook/migrations/0148_food_to_tree.py rename to cookbook/migrations/0150_food_to_tree.py index 210af252f..1bcb933c9 100644 --- a/cookbook/migrations/0148_food_to_tree.py +++ b/cookbook/migrations/0150_food_to_tree.py @@ -27,7 +27,7 @@ def backwards(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('cookbook', '0147_auto_20210813_1829'), + ('cookbook', '0149_fix_leading_trailing_spaces'), ] operations = [