diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py index 9163e57e92..26ff15580f 100644 --- a/awx/main/models/notifications.py +++ b/awx/main/models/notifications.py @@ -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', diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js index 92ad403101..29f1764a72 100644 --- a/awx/ui/client/src/notifications/notificationTemplates.form.js +++ b/awx/ui/client/src/notifications/notificationTemplates.form.js @@ -598,7 +598,7 @@ export default ['i18n', function(i18n) { '{{ url }}, or attributes of the job such as ' + '{{ job.status }}. You may apply a number of possible ' + 'variables in the message. Refer to the ' + - 'Ansible Tower documentation for more details.'), closeable: false },