External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

update to not use organizations

Browse Source
This commit is contained in:
sean-m-sullivan
2020-09-01 23:08:15 -05:00
parent d05c7d6cc5
commit a17eedd9fe
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx_collection/plugins/modules/tower_job_template.py
View File

@@ -479,13 +479,14 @@ def main():
labels = module.params.get('labels') labels = module.params.get('labels')
if labels is not None: if labels is not None:
association_fields['labels'] = [] association_fields['labels'] = []
for item in labels: for item in labels:
search_fields = {'name': item} association_fields['labels'].append(module.resolve_name_to_id('labels', item))
if organization: # Code to use once Issue #7567 is resolved
search_fields['organization'] = organization_id # search_fields = {'name': item}
label_id = module.get_one('labels', **{'data': search_fields}) # if organization:
association_fields['labels'].append(label_id) # search_fields['organization'] = organization_id
# label_id = module.get_one('labels', **{'data': search_fields})
# association_fields['labels'].append(label_id)
notifications_start = module.params.get('notification_templates_started') notifications_start = module.params.get('notification_templates_started')
if notifications_start is not None: if notifications_start is not None:

13
awx_collection/plugins/modules/tower_workflow_job_template.py
View File

@@ -256,13 +256,14 @@ def main():
labels = module.params.get('labels') labels = module.params.get('labels')
if labels is not None: if labels is not None:
association_fields['labels'] = [] association_fields['labels'] = []
for item in labels: for item in labels:
search_fields = {'name': item} association_fields['labels'].append(module.resolve_name_to_id('labels', item))
if organization: # Code to use once Issue #7567 is resolved
search_fields['organization'] = organization_id # search_fields = {'name': item}
label_id = module.get_one('labels', **{'data': search_fields}) # if organization:
association_fields['labels'].append(label_id) # search_fields['organization'] = organization_id
# label_id = module.get_one('labels', **{'data': search_fields})
# association_fields['labels'].append(label_id)
on_change = None on_change = None
new_spec = module.params.get('survey') new_spec = module.params.get('survey')