External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 02:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4628 from chrismeyersfsu/fix-4437

Browse Source 
word wrap large callback key in alert modal
This commit is contained in:
Chris Meyers
2017-01-11 16:05:32 -05:00
committed by GitHub
parent 4c6ec808ee f2d2409c16
commit 3b766cb3e3
2 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
View File

@@ -287,20 +287,18 @@
if (data.related && if (data.related &&
data.related.callback) { data.related.callback) {
Alert('Callback URL', Alert('Callback URL',
`<div> `Host callbacks are enabled for this template. The callback URL is:
<p>Host callbacks are enabled for this template. The callback URL is:</p> <p style=\"padding: 10px 0;\">
<p style=\"padding: 10px 0;\"> <strong>
<strong> ${$scope.callback_server_path}
${$scope.callback_server_path} ${data.related.callback}
${data.related.callback} </strong>
</string> </p>
</p> <p class="break">The host configuration key is:
<p>The host configuration key is: <strong>
<strong> ${$filter('sanitize')(data.host_config_key)}
${$filter('sanitize')(data.host_config_key)} </strong>
</string> </p>`,
</p>
</div>`,
'alert-danger', saveCompleted, null, null, 'alert-danger', saveCompleted, null, null,
null, true); null, true);
} }

29
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@@ -423,23 +423,20 @@ export default
if (data.related && if (data.related &&
data.related.callback) { data.related.callback) {
Alert('Callback URL', Alert('Callback URL',
` `Host callbacks are enabled for this template. The callback URL is:
<div> <p style=\"padding: 10px 0;\">
<p>Host callbacks are enabled for this template. The callback URL is:</p> <strong>
<p style=\"padding: 10px 0;\"> ${$scope.callback_server_path}
<strong> ${data.related.callback}
${$scope.callback_server_path} </strong>
${data.related.callback} </p>
</string> <p class="break">The host configuration key is:
</p> <strong>
<p>The host configuration key is: ${$filter('sanitize')(data.host_config_key)}
<strong> </strong>
${$filter('sanitize')(data.host_config_key)} </p>
</string>
</p>
</div>
`, `,
'alert-info', saveCompleted, null, null, 'alert-danger', saveCompleted, null, null,
null, true); null, true);
} }
var orgDefer = $q.defer(); var orgDefer = $q.defer();