thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

Merge pull request #1761 from makeplane/develop

Browse Source 
promote: develop to stage-release
This commit is contained in:
Nikhil 2023-08-01 22:07:03 +05:30 committed by GitHub
commit 9828d2332a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apiserver/plane/api/views/project.py
View File

@ -123,7 +123,7 @@ class ProjectViewSet(BaseViewSet):
sort_order_query = ProjectMember.objects.filter( sort_order_query = ProjectMember.objects.filter(
member=request.user, member=request.user,
project_id=OuterRef("pk"), project_id=OuterRef("pk"),
workspace__slug=self.kwargs.get("slug"), workspace__slug=self.kwargs.get("slug"),
).values("sort_order") ).values("sort_order")
projects = ( projects = (
self.get_queryset() self.get_queryset()
@ -602,19 +602,29 @@ class AddMemberToProjectEndpoint(BaseAPIView):
) )
bulk_project_members = [] bulk_project_members = []
project_members = ProjectMember.objects.filter( project_members = (
workspace=self.workspace, member_id__in=[member.get("member_id") for member in members] ProjectMember.objects.filter(
).values("member_id").annotate(sort_order_min=Min("sort_order")) workspace__slug=slug,
member_id__in=[member.get("member_id") for member in members],
)
.values("member_id", "sort_order")
.order_by("sort_order")
)
for member in members: for member in members:
sort_order = [project_member.get("sort_order") for project_member in project_members] sort_order = [
project_member.get("sort_order")
for project_member in project_members
if str(project_member.get("member_id"))
== str(member.get("member_id"))
]
bulk_project_members.append( bulk_project_members.append(
ProjectMember( ProjectMember(
member_id=member.get("member_id"), member_id=member.get("member_id"),
role=member.get("role", 10), role=member.get("role", 10),
project_id=project_id, project_id=project_id,
workspace_id=project.workspace_id, workspace_id=project.workspace_id,
sort_order=sort_order[0] - 10000 if len(sort_order) else 65535 sort_order=sort_order[0] - 10000 if len(sort_order) else 65535,
) )
) )