From 1d0488fbb03a9e7ade22a3c35603d105e6a11d9e Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 3 Dec 2025 18:09:05 +0100 Subject: [PATCH] temporary fix --- cookbook/serializer.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index d99d7f4af..55788c24c 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -187,15 +187,18 @@ class SpaceFilterSerializer(serializers.ListSerializer): data = [] else: iterable = data.all() if hasattr(data, 'all') else data - if isinstance(iterable, list) or (isinstance(iterable, QuerySet) and getattr(iterable, '_result_cache', None) is not None): - data = [d for d in iterable if d.userspace.space.id == self.context['request'].space.id] - else: - if hasattr(self.context['request'], 'space'): - data = data.filter(userspace__space=self.context['request'].space).all() + try: + if isinstance(iterable, list) or (isinstance(iterable, QuerySet) and getattr(iterable, '_result_cache', None) is not None): + data = [d for d in iterable if d.userspace.space.id == self.context['request'].space.id] else: - # not sure why but this branch can be hit (just normal page load, need to see why) - data = data.filter(userspace__space=self.context['request'].user.get_active_space()).all() - + if hasattr(self.context['request'], 'space'): + data = data.filter(userspace__space=self.context['request'].space).all() + else: + # not sure why but this branch can be hit (just normal page load, need to see why) + data = data.filter(userspace__space=self.context['request'].user.get_active_space()).all() + except Exception: + # not sure why but this branch can be hit (just normal page load, need to see why) + data = data.filter(userspace__space=self.context['request'].user.get_active_space()).all() elif isinstance(data, list): data = [d for d in data if getattr(d, self.child.Meta.model.get_space_key()[0]) == self.context['request'].space] else: