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

Playbook select list finally works on edit. Woot\!

Browse Source
This commit is contained in:
chouseknecht
2013-05-17 16:14:33 -04:00
parent 94ff36b62f
commit 4abe92a7a6
15 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ui/static/css/ansible-ui.css
View File

@@ -233,6 +233,7 @@
padding: 0; padding: 0;
} }
/* Display list actions next to search widget */
.search-widget { .search-widget {
display: inline-block; display: inline-block;
} }
@@ -243,3 +244,8 @@
margin-left: 15px; margin-left: 15px;
margin-top: 3px; margin-top: 3px;
} }
/* Display list actions */
.well {
padding-bottom: 0;
}

64
lib/ui/static/js/controllers/JobTemplates.js
View File

@@ -341,37 +341,37 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
var id = $routeParams.id; var id = $routeParams.id;
var relatedSets = {}; var relatedSets = {};
function getPlaybooks() {
var url = GetBasePath('projects') + scope.project + '/playbooks/'; function getPlaybooks(project) {
Rest.setUrl(url); if (project !== null && project !== '' && project !== undefined) {
Rest.get() var url = GetBasePath('projects') + project + '/playbooks/';
.success( function(data, status, headers, config) { Rest.setUrl(url);
var opts = []; Rest.get()
for (var i=0; i < data.length; i++) { .success( function(data, status, headers, config) {
opts.push({ label: data[i], value: data[i] }); scope.playbook_options = [];
} for (var i=0; i < data.length; i++) {
scope.playbook_options = opts; scope.playbook_options.push(data[i]);
}) }
.error( function(data, status, headers, config) { })
ProcessErrors(scope, data, status, form, .error( function(data, status, headers, config) {
{ hdr: 'Error!', msg: 'Failed to get playbook list for ' + url +'. GET returned status: ' + status }); ProcessErrors(scope, data, status, form,
}); { hdr: 'Error!', msg: 'Failed to get playbook list for ' + url +'. GET returned status: ' + status });
});
}
} }
// Update playbook select whenever project value changes // Register a watcher on project_name. Refresh the playbook list on change.
var selectPlaybook = function(oldValue, newValue) {
if (oldValue != newValue && scope.project) {
getPlaybooks();
}
};
// Register a watcher on project_name
if (scope.selectPlaybookUnregister) { if (scope.selectPlaybookUnregister) {
scope.selectPlaybookUnregister(); scope.selectPlaybookUnregister();
} }
scope.selectPlaybookUnregister = scope.$watch('project_name', selectPlaybook); scope.selectPlaybookUnregister = scope.$watch('project_name', function(oldValue, newValue) {
if (oldValue !== newValue && newValue !== '' && newValue !== null && newValue !== undefined) {
scope.playbook = null;
getPlaybooks(scope.project);
}
});
// Retrieve each related set // Retrieve each related set and populate the playbook list
if (scope.jobTemplateLoadedRemove) { if (scope.jobTemplateLoadedRemove) {
scope.jobTemplateLoadedRemove(); scope.jobTemplateLoadedRemove();
} }
@@ -379,10 +379,13 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
for (var set in relatedSets) { for (var set in relatedSets) {
scope.search(relatedSets[set].iterator); scope.search(relatedSets[set].iterator);
} }
getPlaybooks(); getPlaybooks(scope.project);
}); });
// Our job type options
scope.job_type_options = [{ value: 'run', label: 'Run' }, { value: 'check', label: 'Check' }]; scope.job_type_options = [{ value: 'run', label: 'Run' }, { value: 'check', label: 'Check' }];
scope.playbook_options = null;
scope.playbook = null;
// Retrieve detail record and prepopulate the form // Retrieve detail record and prepopulate the form
Rest.setUrl(defaultUrl + ':id/'); Rest.setUrl(defaultUrl + ':id/');
@@ -391,9 +394,8 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
LoadBreadCrumbs({ path: '/job_templates/' + id, title: data.name }); LoadBreadCrumbs({ path: '/job_templates/' + id, title: data.name });
for (var fld in form.fields) { for (var fld in form.fields) {
if (data[fld] !== null && data[fld] !== undefined) { if (data[fld] !== null && data[fld] !== undefined) {
if (form.fields[fld].type == 'select') { if (form.fields[fld].type == 'select') {
if (scope[fld + '_options']) { if (scope[fld + '_options'] && scope[fld + '_options'].length > 0) {
for (var i=0; i < scope[fld + '_options'].length; i++) { for (var i=0; i < scope[fld + '_options'].length; i++) {
if (data[fld] == scope[fld + '_options'][i].value) { if (data[fld] == scope[fld + '_options'][i].value) {
scope[fld] = scope[fld + '_options'][i]; scope[fld] = scope[fld + '_options'][i];
@@ -401,7 +403,7 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
} }
} }
else { else {
scope[fld] = { label: data[fld], value: data[fld] }; scope[fld] = data[fld];
} }
} }
else { else {
@@ -416,7 +418,7 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField]; scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField];
} }
} }
scope.url = data.url;
var related = data.related; var related = data.related;
for (var set in form.related) { for (var set in form.related) {
if (related[set]) { if (related[set]) {
@@ -463,7 +465,7 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
Rest.setUrl(defaultUrl + $routeParams.id); Rest.setUrl(defaultUrl + $routeParams.id);
var data = {} var data = {}
for (var fld in form.fields) { for (var fld in form.fields) {
if (form.fields[fld].type == 'select') { if (form.fields[fld].type == 'select' && fld != 'playbook') {
data[fld] = scope[fld].value; data[fld] = scope[fld].value;
} }
else { else {

3
lib/ui/static/js/forms/Credentials.js
View File

@@ -125,7 +125,7 @@ angular.module('CredentialFormDefinition', [])
save: { save: {
label: 'Save', label: 'Save',
icon: 'icon-ok', icon: 'icon-ok',
class: 'btn btn-success', class: 'btn-success',
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true //Disable when $pristine or $invalid, optional
}, },
@@ -133,7 +133,6 @@ angular.module('CredentialFormDefinition', [])
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-remove',
class: 'btn',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

1
lib/ui/static/js/forms/Groups.js
View File

@@ -49,7 +49,6 @@ angular.module('GroupFormDefinition', [])
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-remove',
class: 'btn',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

3
lib/ui/static/js/forms/Hosts.js
View File

@@ -48,7 +48,7 @@ angular.module('HostFormDefinition', [])
save: { save: {
label: 'Save', label: 'Save',
icon: 'icon-ok', icon: 'icon-ok',
class: 'btn btn-success', class: 'btn-success',
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true //Disable when $pristine or $invalid, optional
}, },
@@ -56,7 +56,6 @@ angular.module('HostFormDefinition', [])
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-remove',
class: 'btn',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

3
lib/ui/static/js/forms/Inventories.js
View File

@@ -44,7 +44,7 @@ angular.module('InventoryFormDefinition', [])
save: { save: {
label: 'Save', label: 'Save',
icon: 'icon-ok', icon: 'icon-ok',
class: 'btn btn-success', class: 'btn-success',
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true //Disable when $pristine or $invalid, optional
}, },
@@ -52,7 +52,6 @@ angular.module('InventoryFormDefinition', [])
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-remove',
class: 'btn',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

8
lib/ui/static/js/forms/JobTemplates.js
View File

@@ -31,6 +31,7 @@ angular.module('JobTemplateFormDefinition', [])
job_type: { job_type: {
label: 'Job Type', label: 'Job Type',
type: 'select', type: 'select',
ngOptions: 'type.label for type in job_type_options',
default: 'run', default: 'run',
addRequired: true, addRequired: true,
editRequired: true editRequired: true
@@ -56,6 +57,7 @@ angular.module('JobTemplateFormDefinition', [])
playbook: { playbook: {
label: 'Playbook', label: 'Playbook',
type:'select', type:'select',
ngOptions: 'book for book in playbook_options',
id: 'playbook-select', id: 'playbook-select',
addRequired: true, addRequired: true,
editRequired: true editRequired: true
@@ -98,7 +100,8 @@ angular.module('JobTemplateFormDefinition', [])
extra_vars: { extra_vars: {
label: 'Extra Variables', label: 'Extra Variables',
type: 'textarea', type: 'textarea',
rows: 10, rows: 6,
class: 'span4',
addRequired: false, addRequired: false,
editRequired: false editRequired: false
} }
@@ -108,7 +111,7 @@ angular.module('JobTemplateFormDefinition', [])
save: { save: {
label: 'Save', label: 'Save',
icon: 'icon-ok', icon: 'icon-ok',
class: 'btn btn-success', class: 'btn-success',
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true //Disable when $pristine or $invalid, optional
}, },
@@ -116,7 +119,6 @@ angular.module('JobTemplateFormDefinition', [])
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-remove',
class: 'btn',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

3
lib/ui/static/js/forms/Organizations.js
View File

@@ -35,7 +35,7 @@ angular.module('OrganizationFormDefinition', [])
save: { save: {
label: 'Save', label: 'Save',
icon: 'icon-ok', icon: 'icon-ok',
class: 'btn btn-success', class: 'btn-success',
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true //Disable when $pristine or $invalid, optional
}, },
@@ -43,7 +43,6 @@ angular.module('OrganizationFormDefinition', [])
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-remove',
class: 'btn',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

3
lib/ui/static/js/forms/Teams.js
View File

@@ -44,7 +44,7 @@ angular.module('TeamFormDefinition', [])
save: { save: {
label: 'Save', label: 'Save',
icon: 'icon-ok', icon: 'icon-ok',
class: 'btn btn-success', class: 'btn-success',
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true //Disable when $pristine or $invalid, optional
}, },
@@ -52,7 +52,6 @@ angular.module('TeamFormDefinition', [])
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-remove',
class: 'btn',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

3
lib/ui/static/js/forms/Users.js
View File

@@ -71,7 +71,7 @@ angular.module('UserFormDefinition', [])
save: { save: {
label: 'Save', label: 'Save',
icon: 'icon-ok', icon: 'icon-ok',
class: 'btn btn-success', class: 'btn-success',
ngClick: 'formSave()', //$scope.function to call on click, optional ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: true //Disable when $pristine or $invalid, optional ngDisabled: true //Disable when $pristine or $invalid, optional
}, },
@@ -79,7 +79,6 @@ angular.module('UserFormDefinition', [])
ngClick: 'formReset()', ngClick: 'formReset()',
label: 'Reset', label: 'Reset',
icon: 'icon-remove', icon: 'icon-remove',
class: 'btn',
ngDisabled: true //Disabled when $pristine ngDisabled: true //Disabled when $pristine
} }
}, },

2
lib/ui/static/js/lists/Credentials.js
View File

@@ -14,7 +14,7 @@ angular.module('CredentialsListDefinition', [])
iterator: 'credential', iterator: 'credential',
selectTitle: 'Add Credentials', selectTitle: 'Add Credentials',
editTitle: 'Credentials', editTitle: 'Credentials',
selectInstructions: 'Check the Select checkbox next to each user to be added, and click Finished when done. Use the green <i class=\"icon-plus\"></i> button to create a new user.', selectInstructions: 'Click on a row to select it, and click Finished when done. Use the green <i class=\"icon-plus\"></i> button to create a new row.',
fields: { fields: {
name: { name: {

2
lib/ui/static/js/lists/JobTemplates.js
View File

@@ -14,7 +14,7 @@ angular.module('JobTemplatesListDefinition', [])
iterator: 'job_template', iterator: 'job_template',
selectTitle: 'Add Job Template', selectTitle: 'Add Job Template',
editTitle: 'Job Templates', editTitle: 'Job Templates',
selectInstructions: 'Check the Select checkbox next to each template to be added, and click Finished when done. Use the green <i class=\"icon-plus\"></i> button to create a new template.', selectInstructions: 'Click on a row to select it, and click Finished when done. Use the green <i class=\"icon-plus\"></i> button to create a new row.',
fields: { fields: {
name: { name: {

2
lib/ui/static/js/lists/Teams.js
View File

@@ -14,7 +14,7 @@ angular.module('TeamsListDefinition', [])
iterator: 'team', iterator: 'team',
selectTitle: 'Add Team', selectTitle: 'Add Team',
editTitle: 'Teams', editTitle: 'Teams',
selectInstructions: 'Check the Select checkbox next to each team to be added, and click Finished when done. Use the green <i class=\"icon-plus\"></i> button to create a new team.', selectInstructions: 'Click on a row to select it, and click Finished when done. Use the green <i class=\"icon-plus\"></i> button to create a new row.',
fields: { fields: {
name: { name: {

18
lib/ui/static/lib/ansible/form-generator.js
View File

@@ -22,6 +22,9 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
case 'ngClick': case 'ngClick':
result = "ng-click=\"" + obj[key] + "\" "; result = "ng-click=\"" + obj[key] + "\" ";
break; break;
case 'ngOptions':
result = "ng-options=\"" + obj[key] + "\" ";
break;
case 'ngChange': case 'ngChange':
result = "ng-change=\"" + obj[key] + "\" "; result = "ng-change=\"" + obj[key] + "\" ";
break; break;
@@ -239,9 +242,10 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
html += "<label class=\"control-label\" for=\"" + fld + '">' + field.label + '</label>' + "\n"; html += "<label class=\"control-label\" for=\"" + fld + '">' + field.label + '</label>' + "\n";
html += "<div class=\"controls\">\n"; html += "<div class=\"controls\">\n";
html += "<textarea "; html += "<textarea ";
html += this.attr(field, 'rows'); html += (field.rows) ? this.attr(field, 'rows') : "";
html += "ng-model=\"" + fld + '" '; html += "ng-model=\"" + fld + '" ';
html += 'name="' + fld + '" '; html += 'name="' + fld + '" ';
html += (field.class) ? this.attr(field,'class') : "";
html += (field.ngChange) ? this.attr(field,'ngChange') : ""; html += (field.ngChange) ? this.attr(field,'ngChange') : "";
html += (field.id) ? this.attr(field,'id') : ""; html += (field.id) ? this.attr(field,'id') : "";
html += (field.placeholder) ? this.attr(field,'placeholder') : ""; html += (field.placeholder) ? this.attr(field,'placeholder') : "";
@@ -271,7 +275,8 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
html += "<select "; html += "<select ";
html += "ng-model=\"" + fld + '" '; html += "ng-model=\"" + fld + '" ';
html += 'name="' + fld + '" '; html += 'name="' + fld + '" ';
html += "ng-options=\"o.label for o in " + fld + "_options\" "; //html += "ng-options=\"item.label for item in " + fld + "_options\" ";
html += this.attr(field, 'ngOptions');
html += (field.ngChange) ? this.attr(field,'ngChange') : ""; html += (field.ngChange) ? this.attr(field,'ngChange') : "";
html += (field.id) ? this.attr(field,'id') : ""; html += (field.id) ? this.attr(field,'id') : "";
html += (options.mode == 'edit' && field.editRequired) ? "required " : ""; html += (options.mode == 'edit' && field.editRequired) ? "required " : "";
@@ -412,9 +417,9 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
var button = this.form.buttons[btn]; var button = this.form.buttons[btn];
//button //button
html += "<button "; html += "<button ";
if (button.class) { html += "class=\"btn btn-small";
html += this.attr(button,'class'); html += (button.class) ? " " + button.class : "";
} html += "\" ";
if (button.ngClick) { if (button.ngClick) {
html += this.attr(button,'ngClick'); html += this.attr(button,'ngClick');
} }
@@ -446,8 +451,9 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
if ((!this.modal) && options.related && this.form.related) { if ((!this.modal) && options.related && this.form.related) {
html += this.buildCollections(); html += this.buildCollections();
} }
//console.log(html);
return html; return html;
}, },
buildCollections: function() { buildCollections: function() {

2
lib/ui/static/lib/ansible/list-generator.js
View File

@@ -241,7 +241,7 @@ angular.module('ListGenerator', ['GeneratorHelpers',])
else { else {
html += PaginateWidget({ set: list.name, iterator: list.iterator, mini: true }); html += PaginateWidget({ set: list.name, iterator: list.iterator, mini: true });
} }
console.log(html);
return html; return html;
} }