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

fix a bug that broken custom approval notification messages

Browse Source
This commit is contained in:
Ryan Petrello 2019-11-04 11:23:28 -05:00
parent 8e7d607a47
commit 097b59e74a
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/notifications.py
View File

@ -269,6 +269,7 @@ class JobNotificationMixin(object):
'timeout', 'use_fact_cache', 'launch_type', 'status', 'failed', 'started', 'finished',
'elapsed', 'job_explanation', 'execution_node', 'controller_node', 'allow_simultaneous',
'scm_revision', 'diff_mode', 'job_slice_number', 'job_slice_count', 'custom_virtualenv',
'approval_status', 'approval_node_name', 'workflow_url',
{'host_status_counts': ['skipped', 'ok', 'changed', 'failures', 'dark']},
{'playbook_counts': ['play_count', 'task_count']},
{'summary_fields': [{'inventory': ['id', 'name', 'description', 'has_active_failures',
@ -366,6 +367,9 @@ class JobNotificationMixin(object):
'verbosity': 0},
'job_friendly_name': 'Job',
'url': 'https://towerhost/#/jobs/playbook/1010',
'approval_status': 'approved',
'approval_node_name': 'Approve Me',
'workflow_url': 'https://towerhost/#/workflows/1010',
'job_metadata': """{'url': 'https://towerhost/$/jobs/playbook/13',
'traceback': '',
'status': 'running',

2
awx/ui/client/src/notifications/notificationTemplates.form.js
View File

@ -598,7 +598,7 @@ export default ['i18n', function(i18n) {
'<code ng-non-bindable>{{ url }}</code>, or attributes of the job such as ' +
'<code ng-non-bindable>{{ job.status }}</code>. You may apply a number of possible ' +
'variables in the message. Refer to the ' +
'<a href="https://docs.ansible.com/ansible-tower/latest/html/userguide/notifications.html#create-a-notification-template" ' +
'<a href="https://docs.ansible.com/ansible-tower/latest/html/userguide/notifications.html#create-custom-notifications" ' +
'target="_blank">Ansible Tower documentation</a> for more details.'),
closeable: false
},