Skip to content

Commit 16bcc6b

Browse files
committed
fix: Homepage statistics resource error
1 parent 1011cb2 commit 16bcc6b

1 file changed

Lines changed: 15 additions & 10 deletions

File tree

apps/homepage/serializers/homepage.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from django.db.models import QuerySet, Count, Q, UUIDField, Sum, F, BigIntegerField, Value, ExpressionWrapper, \
1616
IntegerField, Window
1717
from django.db.models.functions import Cast, Coalesce, RowNumber
18+
from django.forms import CharField
1819
from django.http import HttpResponse
1920
from django.utils import timezone
2021
from django.utils.translation import gettext_lazy as _, gettext
@@ -57,7 +58,10 @@ def has_all_permission(auth, permission, workspace_id):
5758
or has_extends_workspace_manage_permission(auth,
5859
permission,
5960
workspace_id)
60-
or hasPermission(auth, permission))
61+
or hasPermission(auth,
62+
permission)
63+
or RoleConstants.USER.name + f':/WORKSPACE/{workspace_id}' in auth.role_list
64+
or RoleConstants.WORKSPACE_MANAGE.name + f':/WORKSPACE/{workspace_id}' in auth.role_list)
6165

6266

6367
def is_workspace_manage(auth, workspace_id):
@@ -125,7 +129,7 @@ def aggregation(self, auth, with_valid=True):
125129
user_id=user_id,
126130
auth_target_type="APPLICATION",
127131
permission_list__overlap=permission_list
128-
)
132+
).exclude(target='default')
129133
.annotate(
130134
target_uuid=Cast(
131135
"target",
@@ -184,7 +188,7 @@ def aggregation(self, auth, with_valid=True):
184188
user_id=user_id,
185189
auth_target_type="APPLICATION",
186190
permission_list__overlap=permission_list
187-
)
191+
).exclude(target='default')
188192
.annotate(
189193
target_uuid=Cast(
190194
"target",
@@ -348,7 +352,7 @@ def _apply_permission_filter(self, queryset, auth, workspace_id, user_id):
348352
user_id=user_id,
349353
auth_target_type="APPLICATION",
350354
permission_list__overlap=permission_list,
351-
)
355+
).exclude(target='default')
352356
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
353357
.values_list("target_uuid", flat=True)
354358
)
@@ -421,7 +425,7 @@ def get_queryset(self, auth):
421425
user_id=user_id,
422426
auth_target_type="APPLICATION",
423427
permission_list__overlap=permission_list,
424-
)
428+
).exclude(target='default')
425429
.annotate(
426430
target_uuid=Cast("target", output_field=UUIDField())
427431
)
@@ -563,7 +567,7 @@ def get_queryset(self, auth):
563567
user_id=user_id,
564568
auth_target_type="APPLICATION",
565569
permission_list__overlap=permission_list
566-
)
570+
).exclude(target='default')
567571
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
568572
.values_list("target_uuid", flat=True)
569573
)
@@ -751,7 +755,7 @@ def get_aggregation_query_set(self, auth):
751755
user_id=user_id,
752756
auth_target_type="APPLICATION",
753757
permission_list__overlap=permission_list
754-
).annotate(target_uuid=Cast("target", output_field=UUIDField()))
758+
).exclude(target='default').annotate(target_uuid=Cast("target", output_field=UUIDField()))
755759
.values_list("target_uuid", flat=True))
756760

757761
def aggregation(self, auth, with_valid=True):
@@ -790,7 +794,7 @@ def get_aggregation_query_set(self, auth):
790794
user_id=user_id,
791795
auth_target_type="KNOWLEDGE",
792796
permission_list__overlap=permission_list
793-
).annotate(
797+
).exclude(target='default').annotate(
794798
target_uuid=Cast("target", output_field=UUIDField()))
795799
.values_list("target_uuid", flat=True))
796800

@@ -839,7 +843,8 @@ def get_aggregation_query_set(self, auth):
839843
user_id=user_id,
840844
auth_target_type="TOOL",
841845
permission_list__overlap=permission_list
842-
).annotate(
846+
)
847+
.exclude(target='default').annotate(
843848
target_uuid=Cast("target", output_field=UUIDField()))
844849
.values_list("target_uuid", flat=True))
845850

@@ -885,7 +890,7 @@ def get_aggregation_query_set(self, auth):
885890
user_id=user_id,
886891
auth_target_type="MODEL",
887892
permission_list__overlap=permission_list
888-
).annotate(
893+
).exclude(target='default').annotate(
889894
target_uuid=Cast("target", output_field=UUIDField()))
890895
.values_list("target_uuid", flat=True))
891896

0 commit comments

Comments
 (0)