fixed migrations
This commit is contained in:
parent
bf3feef707
commit
d7d552c5c5
@ -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'] = []
|
||||
|
@ -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 = [
|
||||
|
@ -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 = [
|
Loading…
Reference in New Issue
Block a user