From 806e6d143fd0aba88716bcd25eed0d4783400f23 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 10 Jan 2017 09:15:46 -0500 Subject: [PATCH 1/2] word wrap large callback key in alert modal --- .../add-job-template/job-template-add.controller.js | 2 +- .../edit-job-template/job-template-edit.controller.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 bbb97b3684..858cfc3452 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 @@ -295,7 +295,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 83df997d81..a42c089273 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 @@ -432,14 +432,14 @@ export default ${data.related.callback}

-

The host configuration key is: +

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

`, - 'alert-info', saveCompleted, null, null, + 'alert-danger', saveCompleted, null, null, null, true); } var orgDefer = $q.defer(); From f2d2409c16f0f2eb4a805435277ebf68b7fbdb9a Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 10 Jan 2017 17:03:42 -0500 Subject: [PATCH 2/2] mispellings and reduce verticle space usage --- .../job-template-add.controller.js | 26 +++++++++--------- .../job-template-edit.controller.js | 27 +++++++++---------- 2 files changed, 24 insertions(+), 29 deletions(-) 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 858cfc3452..d6f26092f7 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 @@ -287,20 +287,18 @@ if (data.related && data.related.callback) { Alert('Callback URL', -`
-

Host callbacks are enabled for this template. The callback URL is:

-

- - ${$scope.callback_server_path} - ${data.related.callback} - -

-

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

-
`, +`Host callbacks are enabled for this template. The callback URL is: +

+ + ${$scope.callback_server_path} + ${data.related.callback} + +

+

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

`, 'alert-danger', saveCompleted, null, null, null, true); } 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 a42c089273..f4df25796b 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 @@ -423,21 +423,18 @@ export default if (data.related && data.related.callback) { Alert('Callback URL', -` -
-

Host callbacks are enabled for this template. The callback URL is:

-

- - ${$scope.callback_server_path} - ${data.related.callback} - -

-

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

-
+`Host callbacks are enabled for this template. The callback URL is: +

+ + ${$scope.callback_server_path} + ${data.related.callback} + +

+

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

`, 'alert-danger', saveCompleted, null, null, null, true);