cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed migrations

Browse Source
This commit is contained in:
smilerz 2021-08-24 22:53:21 -05:00
parent bf3feef707
commit d7d552c5c5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/helper/recipe_search.py
View File

@ -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 using an OR search, will annotate all keywords, otherwise, just those that appear in results
if search_keywords_or: 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: else:
foods = Food.objects.filter(ingredient__step__recipe__in=list(qs.values_list('id', flat=True))).annotate(recipe_count=Count('ingredient')) 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) food_a = annotated_qs(foods, root=True, fill=True)
# TODO add rating facet # TODO add rating facet
facets['Ratings'] = [] facets['Ratings'] = []

2
cookbook/migrations/0149_fix_leading_trailing_spaces.py
View File

@ -23,7 +23,7 @@ def backwards(apps, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('cookbook', '0148_food_to_tree'), ('cookbook', '0148_auto_20210813_1829'),
] ]
operations = [ operations = [

2
cookbook/migrations/0148_food_to_tree.py → cookbook/migrations/0150_food_to_tree.py
View File

@ -27,7 +27,7 @@ def backwards(apps, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('cookbook', '0147_auto_20210813_1829'), ('cookbook', '0149_fix_leading_trailing_spaces'),
] ]
operations = [ operations = [