External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 19:10:07 -03: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
commit 3b766cb3e3
2 changed files with 25 additions and 30 deletions
Show Stats 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 &&
data.related.callback) {
Alert('Callback URL',
`<div>
<p>Host callbacks are enabled for this template. The callback URL is:</p>
<p style=\"padding: 10px 0;\">
<strong>
${$scope.callback_server_path}
${data.related.callback}
</string>
</p>
<p>The host configuration key is:
<strong>
${$filter('sanitize')(data.host_config_key)}
</string>
</p>
</div>`,
`Host callbacks are enabled for this template. The callback URL is:
<p style=\"padding: 10px 0;\">
<strong>
${$scope.callback_server_path}
${data.related.callback}
</strong>
</p>
<p class="break">The host configuration key is:
<strong>
${$filter('sanitize')(data.host_config_key)}
</strong>
</p>`,
'alert-danger', saveCompleted, null, null,
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 &&
data.related.callback) {
Alert('Callback URL',
`
<div>
<p>Host callbacks are enabled for this template. The callback URL is:</p>
<p style=\"padding: 10px 0;\">
<strong>
${$scope.callback_server_path}
${data.related.callback}
</string>
</p>
<p>The host configuration key is:
<strong>
${$filter('sanitize')(data.host_config_key)}
</string>
</p>
</div>
`Host callbacks are enabled for this template. The callback URL is:
<p style=\"padding: 10px 0;\">
<strong>
${$scope.callback_server_path}
${data.related.callback}
</strong>
</p>
<p class="break">The host configuration key is:
<strong>
${$filter('sanitize')(data.host_config_key)}
</strong>
</p>
`,
'alert-info', saveCompleted, null, null,
'alert-danger', saveCompleted, null, null,
null, true);
}
var orgDefer = $q.defer();