mirror of
https://github.com/ansible/awx.git
synced 2026-09-16 17:00:12 -02:30
Deprecated Team.projects and Project.teams relations, switching to using RBAC
This commit is contained in:
@@ -33,6 +33,11 @@ class Migration(migrations.Migration):
|
||||
'users',
|
||||
'deprecated_users',
|
||||
),
|
||||
migrations.RenameField(
|
||||
'Team',
|
||||
'projects',
|
||||
'deprecated_projects',
|
||||
),
|
||||
|
||||
migrations.CreateModel(
|
||||
name='Role',
|
||||
|
||||
@@ -208,7 +208,7 @@ class UserAccess(BaseAccess):
|
||||
Q(pk=self.user.pk) |
|
||||
Q(organizations__in=self.user.deprecated_admin_of_organizations) |
|
||||
Q(organizations__in=self.user.deprecated_organizations) |
|
||||
Q(teams__in=self.user.teams)
|
||||
Q(deprecated_teams__in=self.user.deprecated_teams)
|
||||
).distinct()
|
||||
|
||||
def can_add(self, data):
|
||||
@@ -690,7 +690,7 @@ class ProjectAccess(BaseAccess):
|
||||
qs = qs.filter(Q(created_by=self.user, deprecated_organizations__isnull=True) |
|
||||
Q(deprecated_organizations__deprecated_admins__in=[self.user]) |
|
||||
Q(deprecated_organizations__deprecated_users__in=[self.user]) |
|
||||
Q(teams__in=team_ids))
|
||||
Q(deprecated_teams__in=team_ids))
|
||||
allowed_deploy = [PERM_JOBTEMPLATE_CREATE, PERM_INVENTORY_DEPLOY]
|
||||
allowed_check = [PERM_JOBTEMPLATE_CREATE, PERM_INVENTORY_DEPLOY, PERM_INVENTORY_CHECK]
|
||||
|
||||
|
||||
@@ -265,7 +265,7 @@ def migrate_projects(apps, schema_editor):
|
||||
project.admin_role.members.add(project.created_by)
|
||||
migrations[project.name]['users'].add(project.created_by)
|
||||
|
||||
for team in project.teams.all():
|
||||
for team in project.deprecated_teams.all():
|
||||
team.member_role.children.add(project.member_role)
|
||||
migrations[project.name]['teams'].add(team)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user