External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-08-03 11:30:00 -02:30
Code Issues Packages Projects Releases Wiki Activity

Deprecated Team.projects and Project.teams relations, switching to using RBAC

Browse Source
This commit is contained in:
Akita Noek
2016-03-23 15:30:03 -04:00
parent 9dbe9fb7ad
commit 4aa1602255
7 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/migrations/_old_access.py
View File

@@ -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]