External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

JobSubmission cleanup

Browse Source 
added some cleanup to old code in JobSubmission
This commit is contained in:
Jared Tabor
2014-11-13 11:20:39 -05:00
parent 8d2a011ca8
commit 6a08738071
2 changed files with 10 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -14,6 +14,7 @@ awx/tower_warnings.log
tower/tower_warnings.log tower/tower_warnings.log
celerybeat-schedule celerybeat-schedule
awx/ui/static/docs awx/ui/static/docs
tools
# Python & setuptools # Python & setuptools
__pycache__ __pycache__

69
awx/ui/static/js/helpers/JobSubmission.js
View File

@@ -18,7 +18,6 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
function(Rest, Wait, ProcessErrors, ToJSON, Empty) { function(Rest, Wait, ProcessErrors, ToJSON, Empty) {
return function(params) { return function(params) {
var scope = params.scope, var scope = params.scope,
// passwords = params.passwords || {},
callback = params.callback || 'JobLaunched', callback = params.callback || 'JobLaunched',
job_launch_data = {}, job_launch_data = {},
url = params.url, url = params.url,
@@ -45,6 +44,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
} }
} }
Rest.setUrl(url); Rest.setUrl(url);
Rest.post(job_launch_data) Rest.post(job_launch_data)
.success(function(data) { .success(function(data) {
@@ -59,18 +59,6 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
msg: 'Failed updating job ' + scope.job_template_id + ' with variables. PUT returned: ' + status }); msg: 'Failed updating job ' + scope.job_template_id + ' with variables. PUT returned: ' + status });
}); });
// Wait('start');
// Rest.setUrl(url);
// Rest.post(passwords)
// .success(function(data) {
// scope.new_job_id = data.job;
// scope.$emit(callback, data);
// })
// .error(function (data, status) {
// ProcessErrors(scope, data, status, null, { hdr: 'Error!',
// msg: 'Attempt to start job at ' + url + ' failed. POST returned: ' + status });
// });
}; };
}]) }])
@@ -698,48 +686,9 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
url = GetBasePath('jobs') + id + '/relaunch/'; url = GetBasePath('jobs') + id + '/relaunch/';
} }
if(!Empty(system_job) && system_job === 'launch'){
// if (scope.removePostTheJob) { url = GetBasePath('system_job_templates') + id + '/launch/';
// scope.removePostTheJob(); }
// }
// scope.removePostTheJob = scope.$on('PostTheJob', function() {
// var url = (job_template.related.jobs) ? job_template.related.jobs : job_template.related.job_template + 'jobs/';
// Wait('start');
// Rest.setUrl(url);
// Rest.post(job_template)
// .success(function (data) {
// new_job_id = data.id;
// launch_url = data.related.start;
// prompt_for_vars = data.ask_variables_on_launch;
// new_job = data;
// if (data.passwords_needed_to_start.length > 0) {
// scope.$emit('PromptForPasswords', data.passwords_needed_to_start);
// }
// else if (data.ask_variables_on_launch) {
// scope.$emit('PromptForVars');
// }
// else {
// scope.$emit('StartPlaybookRun');
// }
// })
// .error(function (data, status) {
// var key, html;
// if (status === 400) {
// // there's a data problem with the job template
// html = "<ul style=\"list-style-type: none; margin: 15px 0;\">\n";
// for (key in data) {
// html += "<li><strong>" + key + "</strong>: " + data[key][0] + "</li>\n";
// }
// html += "</ul>\n";
// Wait('stop');
// Alert('Job Template Error', "<p>Fix the following issues before using the template:</p>" + html, 'alert-danger');
// }
// else {
// ProcessErrors(scope, data, status, null, { hdr: 'Error!',
// msg: 'Failed to create job. POST returned status: ' + status });
// }
// });
// });
if (scope.removeCancelJob) { if (scope.removeCancelJob) {
scope.removeCancelJob(); scope.removeCancelJob();
@@ -762,9 +711,9 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
scope.removePlaybookLaunchFinished(); scope.removePlaybookLaunchFinished();
} }
scope.removePlaybookLaunchFinished = scope.$on('PlaybookLaunchFinished', function(e, data) { scope.removePlaybookLaunchFinished = scope.$on('PlaybookLaunchFinished', function(e, data) {
//var base = $location.path().replace(/^\//, '').split('/')[0]; var job = data.job || data.system_job;
if(scope.portalMode===false || scope.$parent.portalMode===false ){ if((scope.portalMode===false || scope.$parent.portalMode===false ) && Empty(data.system_job)){
$location.path('/jobs/' + data.job); $location.path('/jobs/' + job);
} }
}); });
@@ -883,12 +832,12 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
// new_job = data; // new_job = data;
html = '<form class=" ng-valid ng-valid-required" name="job_launch_form" id="job_launch_form" autocomplete="off" nonvalidate>'; html = '<form class=" ng-valid ng-valid-required" name="job_launch_form" id="job_launch_form" autocomplete="off" nonvalidate>';
if (data.passwords_needed_to_start.length > 0) { if (!Empty(data.passwords_needed_to_start) && data.passwords_needed_to_start.length > 0) {
scope.$emit('PromptForPasswords', data.passwords_needed_to_start, html, url); scope.$emit('PromptForPasswords', data.passwords_needed_to_start, html, url);
} }
else if (data.ask_variables_on_launch) { else if (data.ask_variables_on_launch) {
scope.$emit('PromptForVars', html, url); scope.$emit('PromptForVars', html, url);
} else if (data.survey_enabled===true) { } else if (!Empty(data.survey_enabled) && data.survey_enabled===true) {
scope.$emit('PromptForSurvey', html, url); scope.$emit('PromptForSurvey', html, url);
} }
else { else {