Directives integer, min, max, and awlookup now working. Lookups now allow user to enter a value, the name is validated, and capitalization is corrected.

This commit is contained in:
chouseknecht
2013-05-15 12:53:53 -04:00
parent b3615465d1
commit 86bd91dfb8
28 changed files with 16588 additions and 55 deletions

View File

@@ -132,7 +132,7 @@ JobTemplatesList.$inject = [ '$scope', '$rootScope', '$location', '$log', '$rout
function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeParams, JobTemplateForm,
GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope,
GetBasePath, InventoryList, CredentialList, LookUpInit)
GetBasePath, InventoryList, CredentialList, ProjectList, LookUpInit)
{
ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
//scope.
@@ -161,6 +161,38 @@ function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeP
field: 'credential'
});
// Update playbook select whenever project value changes
var selectPlaybook = function(oldValue, newValue) {
$('#playbook-select option').each( function(index) {
if (index > 0) {
$(this).remove();
}
});
if (scope.project) {
var url = GetBasePath('projects') + scope.project + '/playbooks/';
Rest.setUrl(url);
Rest.get()
.success( function(data, status, headers, config) {
for (var i=0; i < data.length; i++) {
$('#playbook-select').append('<option value="' + data[i] + '">' + data[i] + '</option>');
}
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to get playbook list for ' + url +'. GET returned status: ' + status });
});
}
};
scope.$watch('project_name', selectPlaybook);
LookUpInit({
scope: scope,
form: form,
current_item: null,
list: ProjectList,
field: 'project'
});
// Save
scope.formSave = function() {
Rest.setUrl(defaultUrl);
@@ -170,15 +202,40 @@ function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeP
}
Rest.post(data)
.success( function(data, status, headers, config) {
ReturnToCaller(1);
// Template saved. Now post job
Rest.setUrl(data.related.jobs);
Rest.post({
name: data.name,
description: data.description,
job_template: data.job_template,
job_type: data.job_type,
inventory: data.inventory,
project: data.project,
playbook: data.playbook,
credential: data.credential,
forks: data.forks,
limit: data.limit,
verbosity: data.verbosity,
extra_vars: data.extra_vars})
.success( function(data, status, headers, config) {
// <--- We'll need something to prompt for passwords and then actually start
// the job
console.log('Job posted!');
console.log(data);
// Do we need to cancel the watch on playbook select????
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to post job. POST returned status: ' + status });
});
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to add new user. Post returned status: ' + status });
{ hdr: 'Error!', msg: 'Failed to add new project. POST returned status: ' + status });
});
};
// Cancel
// Reset
scope.formReset = function() {
// Defaults
generator.reset();
@@ -188,5 +245,5 @@ function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeP
JobTemplatesAdd.$inject = [ '$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'JobTemplateForm',
'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope',
'GetBasePath', 'InventoryList', 'CredentialList', 'LookUpInit' ];
'GetBasePath', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit' ];