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

Simplifier update_admin_role #5513

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Simplifier update_admin_role #5513

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions itou/common_apps/organizations/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@ def deactivate_org_member(request, target_member):


def update_org_admin_role(request, target_member, action):
if not request.is_current_organization_admin or target_member not in request.current_organization.active_members:
if not request.is_current_organization_admin or target_member == request.user:
raise PermissionDenied

membership = request.current_organization.memberships.get(user=target_member)
try:
membership = request.current_organization.memberships.get(user=target_member, is_active=True)
except ObjectDoesNotExist:
raise PermissionDenied

if request.method == "POST":
if request.user != target_member and request.is_current_organization_admin and membership.is_active:
if action == "add":
membership.set_admin_role(is_admin=True, updated_by=request.user)
messages.success(
request, f"{target_member.get_full_name()} a été ajouté(e) aux administrateurs de cette structure."
)
request.current_organization.add_admin_email(target_member).send()
if action == "remove":
membership.set_admin_role(is_admin=False, updated_by=request.user)
messages.success(
request, f"{target_member.get_full_name()} a été retiré(e) des administrateurs de cette structure."
)
request.current_organization.remove_admin_email(target_member).send()
membership.save()
else:
raise PermissionDenied
if action == "add":
membership.set_admin_role(is_admin=True, updated_by=request.user)
messages.success(
request, f"{target_member.get_full_name()} a été ajouté(e) aux administrateurs de cette structure."
)
request.current_organization.add_admin_email(target_member).send()
if action == "remove":
membership.set_admin_role(is_admin=False, updated_by=request.user)
messages.success(
request, f"{target_member.get_full_name()} a été retiré(e) des administrateurs de cette structure."
)
request.current_organization.remove_admin_email(target_member).send()
membership.save()
return True

return False