mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-16 14:34:10 +02:00
remove superuser, and assign perm to transfer user
This commit is contained in:
parent
9ad7b7523b
commit
7a1348258d
3 changed files with 7 additions and 15 deletions
|
@ -5,7 +5,6 @@ from registrar.models import Domain, DomainInformation, DomainInvitation, Domain
|
||||||
|
|
||||||
# Constants for clarity
|
# Constants for clarity
|
||||||
ALL = "all"
|
ALL = "all"
|
||||||
IS_SUPERUSER = "is_superuser"
|
|
||||||
IS_STAFF = "is_staff"
|
IS_STAFF = "is_staff"
|
||||||
IS_DOMAIN_MANAGER = "is_domain_manager"
|
IS_DOMAIN_MANAGER = "is_domain_manager"
|
||||||
IS_DOMAIN_REQUEST_CREATOR = "is_domain_request_creator"
|
IS_DOMAIN_REQUEST_CREATOR = "is_domain_request_creator"
|
||||||
|
@ -88,9 +87,6 @@ def _user_has_permission(user, request, rules, **kwargs):
|
||||||
if IS_STAFF in rules:
|
if IS_STAFF in rules:
|
||||||
conditions_met.append(user.is_staff)
|
conditions_met.append(user.is_staff)
|
||||||
|
|
||||||
if not any(conditions_met) and IS_SUPERUSER in rules:
|
|
||||||
conditions_met.append(user.is_superuser)
|
|
||||||
|
|
||||||
if not any(conditions_met) and IS_DOMAIN_MANAGER in rules:
|
if not any(conditions_met) and IS_DOMAIN_MANAGER in rules:
|
||||||
has_permission = _is_domain_manager(user, **kwargs)
|
has_permission = _is_domain_manager(user, **kwargs)
|
||||||
conditions_met.append(has_permission)
|
conditions_met.append(has_permission)
|
||||||
|
@ -148,25 +144,19 @@ def _user_has_permission(user, request, rules, **kwargs):
|
||||||
if not any(conditions_met) and HAS_PORTFOLIO_MEMBERS_ANY_PERM in rules:
|
if not any(conditions_met) and HAS_PORTFOLIO_MEMBERS_ANY_PERM in rules:
|
||||||
portfolio = request.session.get("portfolio")
|
portfolio = request.session.get("portfolio")
|
||||||
has_permission = user.is_org_user(request) and (
|
has_permission = user.is_org_user(request) and (
|
||||||
user.has_view_members_portfolio_permission(portfolio) or
|
user.has_view_members_portfolio_permission(portfolio)
|
||||||
user.has_edit_members_portfolio_permission(portfolio)
|
or user.has_edit_members_portfolio_permission(portfolio)
|
||||||
)
|
)
|
||||||
conditions_met.append(has_permission)
|
conditions_met.append(has_permission)
|
||||||
|
|
||||||
if not any(conditions_met) and HAS_PORTFOLIO_MEMBERS_EDIT in rules:
|
if not any(conditions_met) and HAS_PORTFOLIO_MEMBERS_EDIT in rules:
|
||||||
portfolio = request.session.get("portfolio")
|
portfolio = request.session.get("portfolio")
|
||||||
has_permission = (
|
has_permission = user.is_org_user(request) and user.has_edit_members_portfolio_permission(portfolio)
|
||||||
user.is_org_user(request) and
|
|
||||||
user.has_edit_members_portfolio_permission(portfolio)
|
|
||||||
)
|
|
||||||
conditions_met.append(has_permission)
|
conditions_met.append(has_permission)
|
||||||
|
|
||||||
if not any(conditions_met) and HAS_PORTFOLIO_MEMBERS_VIEW in rules:
|
if not any(conditions_met) and HAS_PORTFOLIO_MEMBERS_VIEW in rules:
|
||||||
portfolio = request.session.get("portfolio")
|
portfolio = request.session.get("portfolio")
|
||||||
has_permission = (
|
has_permission = user.is_org_user(request) and user.has_view_members_portfolio_permission(portfolio)
|
||||||
user.is_org_user(request) and
|
|
||||||
user.has_view_members_portfolio_permission(portfolio)
|
|
||||||
)
|
|
||||||
conditions_met.append(has_permission)
|
conditions_met.append(has_permission)
|
||||||
|
|
||||||
return any(conditions_met)
|
return any(conditions_met)
|
||||||
|
|
|
@ -23,7 +23,7 @@ from registrar.models import (
|
||||||
PortfolioInvitation,
|
PortfolioInvitation,
|
||||||
User,
|
User,
|
||||||
UserDomainRole,
|
UserDomainRole,
|
||||||
UserPortfolioPermission
|
UserPortfolioPermission,
|
||||||
)
|
)
|
||||||
from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
|
from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
|
||||||
from registrar.utility.email import EmailSendingError
|
from registrar.utility.email import EmailSendingError
|
||||||
|
@ -573,6 +573,7 @@ class PortfolioInvitedMemberDomainsView(View):
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@grant_access(HAS_PORTFOLIO_MEMBERS_EDIT)
|
@grant_access(HAS_PORTFOLIO_MEMBERS_EDIT)
|
||||||
class PortfolioInvitedMemberDomainsEditView(DetailView, View):
|
class PortfolioInvitedMemberDomainsEditView(DetailView, View):
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
"""Mixin classes."""
|
"""Mixin classes."""
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue