diff --git a/apps/orgs/mixins/api.py b/apps/orgs/mixins/api.py index 9e6f9cb83..cff6056d0 100644 --- a/apps/orgs/mixins/api.py +++ b/apps/orgs/mixins/api.py @@ -70,6 +70,6 @@ class OrgRelationMixin(RelationMixin): def get_queryset(self): queryset = super().get_queryset() if not current_org.is_root(): - org_id = current_org.org_id() + org_id = current_org.id queryset = queryset.filter(**{f'{self.from_field}__org_id': org_id}) return queryset diff --git a/apps/perms/api/asset_permission_relation.py b/apps/perms/api/asset_permission_relation.py index c00870a6c..cc90fd45e 100644 --- a/apps/perms/api/asset_permission_relation.py +++ b/apps/perms/api/asset_permission_relation.py @@ -27,7 +27,7 @@ class RelationMixin(OrgRelationMixin, OrgBulkModelViewSet): def get_queryset(self): queryset = super().get_queryset() - org_id = current_org.org_id() + org_id = current_org.id if org_id is not None: queryset = queryset.filter(assetpermission__org_id=org_id) queryset = queryset.annotate(assetpermission_display=F('assetpermission__name'))