From f9b04a3f1ea41a4b32211ff1b9106b08ca010d59 Mon Sep 17 00:00:00 2001 From: smilerz Date: Tue, 11 Jan 2022 08:33:42 -0600 Subject: [PATCH] bug fix --- cookbook/serializer.py | 6 +++--- cookbook/views/api.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 652e94f8..09520545 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -90,10 +90,10 @@ class CustomOnHandField(serializers.Field): return instance def to_representation(self, obj): - shared_users = [] + shared_users = None if request := self.context.get('request', None): - shared_users = request._shared_users - else: + shared_users = getattr(request, '_shared_users', None) + if shared_users is None: shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [self.context['request'].user.id] return obj.onhand_users.filter(id__in=shared_users).exists() diff --git a/cookbook/views/api.py b/cookbook/views/api.py index b0023d9c..1135cfec 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -270,7 +270,7 @@ class TreeMixin(MergeMixin, FuzzyFilterMixin, ExtendedRecipeMixin): except self.model.DoesNotExist: self.queryset = self.model.objects.none() else: - self.queryset = super().get_queryset() + return self.annotate_recipe(queryset=super().get_queryset(), request=self.request, serializer=self.serializer_class, tree=True) self.queryset = self.queryset.filter(space=self.request.space).order_by('name') return self.annotate_recipe(queryset=self.queryset, request=self.request, serializer=self.serializer_class, tree=True)