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

Use getattrd instead of reduce

Browse Source
This commit is contained in:
Wayne Witzel III
2016-03-17 16:27:47 -04:00
parent 6d249f38a7
commit 766190fb80
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/main/migrations/_rbac.py
View File

@@ -2,6 +2,7 @@ from django.contrib.contenttypes.models import ContentType
from django.db.models import Q from django.db.models import Q
from collections import defaultdict from collections import defaultdict
from awx.main.utils import getattrd
import _old_access as old_access import _old_access as old_access
def migrate_users(apps, schema_editor): def migrate_users(apps, schema_editor):
@@ -63,7 +64,7 @@ def attrfunc(attr_path):
org = get_org(JobTemplateInstance) org = get_org(JobTemplateInstance)
''' '''
def attr(inst): def attr(inst):
return reduce(getattr, [inst] + attr_path.split('.')) return getattrd(inst, attr_path)
return attr return attr
def _update_credential_parents(org, cred): def _update_credential_parents(org, cred):
@@ -96,10 +97,15 @@ def _discover_credentials(instances, cred, orgfunc):
if pos == 0: if pos == 0:
_update_credential_parents(org, cred) _update_credential_parents(org, cred)
else: else:
cred.pk, cred.user, cred.team = None, None, None # Create a new credential
cred.pk = None
cred.save() cred.save()
# Unlink the old information from the new credential
cred.user, cred.team = None, None
cred.owner_role, cred.usage_role = None, None cred.owner_role, cred.usage_role = None, None
cred.save() cred.save()
for i in orgs[org]: for i in orgs[org]:
i.credential = cred i.credential = cred
i.save() i.save()
@@ -135,14 +141,12 @@ def migrate_credential(apps, schema_editor):
if cred.team is not None: if cred.team is not None:
cred.team.admin_role.children.add(cred.owner_role) cred.team.admin_role.children.add(cred.owner_role)
cred.team.member_role.children.add(cred.usage_role) cred.team.member_role.children.add(cred.usage_role)
cred.user = None cred.user, cred.team = None, None
cred.team = None
cred.save() cred.save()
elif cred.user is not None: elif cred.user is not None:
cred.user.admin_role.children.add(cred.owner_role) cred.user.admin_role.children.add(cred.owner_role)
cred.user = None cred.user, cred.team = None, None
cred.team = None
cred.save() cred.save()
# no match found, log # no match found, log