From dc0b4ce10715992ed406024c5cf5395fb9bf998b Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 18 Nov 2019 13:12:24 +0300 Subject: [PATCH] fix collection establishment in_fav --- apps/collection/views/common.py | 8 ++++---- .../migrations/0027_auto_20191118_1011.py | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 apps/location/migrations/0027_auto_20191118_1011.py diff --git a/apps/collection/views/common.py b/apps/collection/views/common.py index 3d06d861..5fdcf4d6 100644 --- a/apps/collection/views/common.py +++ b/apps/collection/views/common.py @@ -18,8 +18,8 @@ class CollectionViewMixin(generics.GenericAPIView): def get_queryset(self): """Override get_queryset method.""" return models.Collection.objects.published() \ - .by_country_code(code=self.request.country_code) \ - .order_by('-on_top', '-modified') + .by_country_code(code=self.request.country_code) \ + .order_by('-on_top', '-modified') class GuideViewMixin(generics.GenericAPIView): @@ -40,7 +40,7 @@ class CollectionHomePageView(CollectionListView): def get_queryset(self): """Override get_queryset.""" return super(CollectionHomePageView, self).get_queryset() \ - .filter_all_related_gt(3) + .filter_all_related_gt(3) class CollectionDetailView(CollectionViewMixin, generics.RetrieveAPIView): @@ -66,7 +66,7 @@ class CollectionEstablishmentListView(CollectionListView): # May raise a permission denied self.check_object_permissions(self.request, collection) - return collection.establishments.all() + return collection.establishments.all().annotate_in_favorites(self.request.user) # Guide diff --git a/apps/location/migrations/0027_auto_20191118_1011.py b/apps/location/migrations/0027_auto_20191118_1011.py new file mode 100644 index 00000000..2937ca15 --- /dev/null +++ b/apps/location/migrations/0027_auto_20191118_1011.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.4 on 2019-11-18 10:11 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('location', '0026_country_is_active'), + ] + + operations = [ + migrations.AlterField( + model_name='winesubregion', + name='wine_region', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='wine_sub_region', to='location.WineRegion', verbose_name='wine sub region'), + ), + ]