From 44688c35df2dcc1f5d00422fc3215b5e0f1efbab Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 16 Jun 2025 12:53:48 +0930 Subject: [PATCH] fix(access): if user has no orgs, dont filter by for query ref: #833 --- app/access/models/tenancy.py | 8 +++++--- app/access/models/tenancy_abstract.py | 6 ++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/access/models/tenancy.py b/app/access/models/tenancy.py index 2d19a0cf..2ca3bfde 100644 --- a/app/access/models/tenancy.py +++ b/app/access/models/tenancy.py @@ -90,9 +90,11 @@ class TenancyManager(models.Manager): else: - return super().get_queryset().filter( - models.Q(organization__in=user_organizations) - ) + # return super().get_queryset().filter( + # models.Q(organization__in=user_organizations) + # ) + + return super().get_queryset().filter() if has_tenant_field: diff --git a/app/access/models/tenancy_abstract.py b/app/access/models/tenancy_abstract.py index e22c0f5a..34e3fef0 100644 --- a/app/access/models/tenancy_abstract.py +++ b/app/access/models/tenancy_abstract.py @@ -43,7 +43,7 @@ class TenancyManager( if user: - tencies = user.get_tenancies(int_list = True) + tenancies = user.get_tenancies(int_list = True) if len(tenancies) > 0 and not request.user.is_superuser: @@ -53,9 +53,7 @@ class TenancyManager( ) - return super().get_queryset().select_related('organization').filter( - models.Q(organization__in = tenancies) - ) + return super().get_queryset().filter() if has_tenant_field: