Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: role updation #1110

Merged
merged 2 commits into from
May 25, 2023
Merged

fix: role updation #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64de382
fix: role updation
pablohashescobar May 22, 2023
8a8a361
Merge branch 'develop' into fix/role_updation
pablohashescobar May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 18 additions & 12 deletions apiserver/plane/api/views/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,15 @@ def list(self, request, slug):
.values("count")
)
.annotate(
total_cycles=Cycle.objects.filter(project_id=OuterRef("id"))
total_cycles=Cycle.objects.filter(
project_id=OuterRef("id"))
.order_by()
.annotate(count=Func(F("id"), function="Count"))
.values("count")
)
.annotate(
total_modules=Module.objects.filter(project_id=OuterRef("id"))
total_modules=Module.objects.filter(
project_id=OuterRef("id"))
.order_by()
.annotate(count=Func(F("id"), function="Count"))
.values("count")
Expand All @@ -134,12 +136,12 @@ def create(self, request, slug):
if serializer.is_valid():
serializer.save()

## Add the user as Administrator to the project
# Add the user as Administrator to the project
ProjectMember.objects.create(
project_id=serializer.data["id"], member=request.user, role=20
)

## Default states
# Default states
states = [
{
"name": "Backlog",
Expand Down Expand Up @@ -320,7 +322,8 @@ def post(self, request, slug, project_id):
)

return Response(
ProjectMemberSerializer(project_member).data, status=status.HTTP_200_OK
ProjectMemberSerializer(
project_member).data, status=status.HTTP_200_OK
)

except ValidationError:
Expand Down Expand Up @@ -374,7 +377,7 @@ def create(self, request):
]
)

## Delete joined project invites
# Delete joined project invites
project_invitations.delete()

return Response(status=status.HTTP_200_OK)
Expand Down Expand Up @@ -412,14 +415,16 @@ def get_queryset(self):

def partial_update(self, request, slug, project_id, pk):
try:
project_member = ProjectMember.objects.get(pk=pk, workspace__slug=slug, project_id=project_id)
project_member = ProjectMember.objects.get(
pk=pk, workspace__slug=slug, project_id=project_id)
if request.user.id == project_member.member_id:
return Response(
{"error": "You cannot update your own role"},
status=status.HTTP_400_BAD_REQUEST,
)

if request.data.get("role", 10) > project_member.role:
# Check while updating user roles
requested_project_member = ProjectMember.objects.get(project_id=project_id, workspace__slug=slug, member=request.user)
if "role" in request.data and request.data.get("role", project_member.role) > requested_project_member.role:
return Response(
{
"error": "You cannot update a role that is higher than your own role"
Expand Down Expand Up @@ -472,7 +477,6 @@ def destroy(self, request, slug, project_id, pk):
capture_exception(e)
return Response({"error": "Something went wrong please try again later"})


class AddMemberToProjectEndpoint(BaseAPIView):
permission_classes = [
ProjectBasePermission,
Expand Down Expand Up @@ -665,7 +669,8 @@ def delete(self, request, slug):
status=status.HTTP_400_BAD_REQUEST,
)

ProjectIdentifier.objects.filter(name=name, workspace__slug=slug).delete()
ProjectIdentifier.objects.filter(
name=name, workspace__slug=slug).delete()

return Response(
status=status.HTTP_204_NO_CONTENT,
Expand Down Expand Up @@ -741,7 +746,8 @@ def post(self, request, slug, project_id):
view_props = project_member.view_props
default_props = project_member.default_props

project_member.view_props = request.data.get("view_props", view_props)
project_member.view_props = request.data.get(
"view_props", view_props)
project_member.default_props = request.data.get(
"default_props", default_props
)
Expand Down
6 changes: 5 additions & 1 deletion apiserver/plane/api/views/workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,11 @@ def partial_update(self, request, slug, pk):
status=status.HTTP_400_BAD_REQUEST,
)

if request.data.get("role", 10) > workspace_member.role:
# Get the requested user role
requested_workspace_member = WorkspaceMember.objects.get(workspace__slug=slug, member=request.user)
# Check if role is being updated
# One cannot update role higher than his own role
if "role" in request.data and request.data.get("role", workspace_member.role) > requested_workspace_member.role:
return Response(
{
"error": "You cannot update a role that is higher than your own role"
Expand Down