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

bug fix

Browse Source
This commit is contained in:
smilerz
2022-01-11 08:33:42 -06:00
parent f7cb067b52
commit f9b04a3f1e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cookbook/serializer.py
View File

@ -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()

2
cookbook/views/api.py
View File

@ -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)