From a9926a64518a2b3ee4025a73ccc573cf3e8a2cfb Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 12 Jan 2017 16:27:23 -0500 Subject: [PATCH] fix overflow on error modal for all things related to #4508 * Removed one-off fix for callback url long host config key --- awx/ui/client/legacy-styles/ansible-ui.less | 1 + .../add-job-template/job-template-add.controller.js | 2 +- .../edit-job-template/job-template-edit.controller.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index e925bff5d4..9be4a91061 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -1677,6 +1677,7 @@ tr td button i { } .modal-body { + .break; padding: 20px 14px 7px 14px; min-height: 120px; } diff --git a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js index d6f26092f7..07d72a615d 100644 --- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js +++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js @@ -294,7 +294,7 @@ ${data.related.callback}

-

The host configuration key is: +

The host configuration key is: ${$filter('sanitize')(data.host_config_key)} diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js index f4df25796b..16904cdaf1 100644 --- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js +++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js @@ -430,7 +430,7 @@ export default ${data.related.callback}

-

The host configuration key is: +

The host configuration key is: ${$filter('sanitize')(data.host_config_key)}