External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 06:29:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1646 from jaredevantabor/1476-cancel-job

Browse Source 
Changes "Cancel" to "OK" on cancel-job-prompt modal
This commit is contained in:
Jared Tabor
2018-05-02 14:16:42 -07:00
committed by GitHub
parent 3b7a50f3e9 7a3fb02791
commit e792abbdc1
6 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/features/output/details.directive.js
View File

@@ -442,9 +442,10 @@ function toggleLabels () {
}
function cancelJob () {
const actionText = strings.get('warnings.CANCEL_ACTION');
const hdr = strings.get('warnings.CANCEL_HEADER');
const warning = strings.get('warnings.CANCEL_BODY');
const actionText = strings.get('cancelJob.CANCEL_JOB');
const hdr = strings.get('cancelJob.HEADER');
const warning = strings.get('cancelJob.SUBMIT_REQUEST');
const cancelText = strings.get('cancelJob.RETURN');
const id = resource.model.get('id');
const name = $filter('sanitize')(resource.model.get('name'));
@@ -467,13 +468,13 @@ function cancelJob () {
});
};
prompt({ hdr, resourceName, body, actionText, action });
prompt({ hdr, resourceName, body, actionText, action, cancelText });
}
function deleteJob () {
const actionText = strings.get('DELETE');
const hdr = strings.get('warnings.DELETE_HEADER');
const warning = strings.get('warnings.DELETE_BODY');
const hdr = strings.get('deleteResource.HEADER');
const warning = strings.get('deleteResource.CONFIRM', 'job');
const id = resource.model.get('id');
const name = $filter('sanitize')(resource.model.get('name'));

8
awx/ui/client/features/output/jobs.strings.js
View File

@@ -8,14 +8,6 @@ function JobsStrings (BaseString) {
TITLE: t.s('JOBZ')
};
ns.warnings = {
CANCEL_ACTION: t.s('PROCEED'),
CANCEL_BODY: t.s('Are you sure you want to cancel this job?'),
CANCEL_HEADER: t.s('Cancel Job'),
DELETE_BODY: t.s('Are you sure you want to delete this job?'),
DELETE_HEADER: t.s('Delete Job'),
};
ns.status = {
RUNNING: t.s('The host status bar will update when the job is complete.'),
UNAVAILABLE: t.s('Host status information for this job is unavailable.'),