Merge pull request #1470 from makeplane/uat

release: v24.10.11-4
This commit is contained in:
sriram veeraghanta
2024-10-11 22:42:33 +05:30
committed by GitHub
2 changed files with 11 additions and 6 deletions

View File

@@ -1,9 +1,5 @@
# Django imports
from django.db.models import (
Exists,
OuterRef,
Prefetch,
)
from django.db.models import Exists, OuterRef, Prefetch, Q
from django.utils import timezone
# Module imports
@@ -69,6 +65,15 @@ class WorkspaceActiveCycleEndpoint(BaseAPIView):
.order_by("-is_favorite", "name")
.distinct()
)
active_cycles = active_cycles.filter(
~Q(
project__project_projectmember__role=5,
project__project_projectmember__member=self.request.user,
project__project_projectmember__is_active=True,
)
)
return self.paginate(
request=request,
queryset=active_cycles,

View File

@@ -64,7 +64,7 @@ export const InboxContentRoot: FC<TInboxContentRoot> = observer((props) => {
const isEditable =
allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT) ||
inboxIssue.created_by === currentUser?.id;
inboxIssue?.created_by === currentUser?.id;
const isGuest = projectPermissionsByWorkspaceSlugAndProjectId(workspaceSlug, projectId) === EUserPermissions.GUEST;
const isOwner = inboxIssue?.issue.created_by === currentUser?.id;