shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 18:21:12 +03:00
Code Releases Activity

Fix old_access user/team reference

Browse Source
This commit is contained in:
Akita Noek 2016-05-02 10:14:29 -04:00
parent 29b55fa04d
commit 8a5e22cb4a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,18 +563,18 @@ class CredentialAccess(BaseAccess):
# If the user is a superuser, and therefore can see everything, this # If the user is a superuser, and therefore can see everything, this
# is also sufficient, and we are done. # is also sufficient, and we are done.
qs = self.model.objects.distinct() qs = self.model.objects.distinct()
qs = qs.select_related('created_by', 'modified_by', 'user', 'team') qs = qs.select_related('created_by', 'modified_by')
if self.user.is_superuser: if self.user.is_superuser:
return qs return qs
# Get the list of organizations for which the user is an admin # Get the list of organizations for which the user is an admin
orgs_as_admin_ids = set(self.user.deprecated_admin_of_organizations.values_list('id', flat=True)) orgs_as_admin_ids = set(self.user.deprecated_admin_of_organizations.values_list('id', flat=True))
return qs.filter( return qs.filter(
Q(user=self.user) | Q(deprecated_user=self.user) |
Q(user__deprecated_organizations__id__in=orgs_as_admin_ids) | Q(deprecated_user__deprecated_organizations__id__in=orgs_as_admin_ids) |
Q(user__deprecated_admin_of_organizations__id__in=orgs_as_admin_ids) | Q(deprecated_user__deprecated_admin_of_organizations__id__in=orgs_as_admin_ids) |
Q(team__organization__id__in=orgs_as_admin_ids) | Q(deprecated_team__organization__id__in=orgs_as_admin_ids) |
Q(team__deprecated_users__in=[self.user]) Q(deprecated_team__deprecated_users__in=[self.user])
) )
def can_add(self, data): def can_add(self, data):
@ -597,22 +597,22 @@ class CredentialAccess(BaseAccess):
return False return False
if self.user == obj.created_by: if self.user == obj.created_by:
return True return True
if obj.user: if obj.deprecated_user:
if self.user == obj.user: if self.user == obj.deprecated_user:
return True return True
if obj.user.deprecated_organizations.filter(deprecated_admins__in=[self.user]).exists(): if obj.deprecated_user.deprecated_organizations.filter(deprecated_admins__in=[self.user]).exists():
return True return True
if obj.user.deprecated_admin_of_organizations.filter(deprecated_admins__in=[self.user]).exists(): if obj.deprecated_user.deprecated_admin_of_organizations.filter(deprecated_admins__in=[self.user]).exists():
return True return True
if obj.team: if obj.deprecated_team:
if self.user in obj.team.organization.deprecated_admins.all(): if self.user in obj.deprecated_team.organization.deprecated_admins.all():
return True return True
return False return False
def can_delete(self, obj): def can_delete(self, obj):
# Unassociated credentials may be marked deleted by anyone, though we # Unassociated credentials may be marked deleted by anyone, though we
# shouldn't ever end up with those. # shouldn't ever end up with those.
if obj.user is None and obj.team is None: if obj.deprecated_user is None and obj.deprecated_team is None:
return True return True
return self.can_change(obj, None) return self.can_change(obj, None)