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

begin re-implementation of auto-populate feature

Browse Source
This commit is contained in:
Chris Meyers 2017-01-06 14:36:00 -05:00 committed by jaredevantabor
parent 0d8d9b3643
commit 67f282f64d
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
awx/ui/client/src/shared/directives.js
View File

@ -463,11 +463,51 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'JobsHelper'])
return {
require: 'ngModel',
link: function(scope, elm, attrs, fieldCtrl) {
let query,
basePath,
defer = $q.defer();
// Auto-populating related fields when there is only 1 relatable entry isn't mission critical.
// Therefore, don't display an error message if the get request fails.
function _doAutoPopulate() {
let modelKey = attrs.ngModel;
let modelName = attrs.source;
let query = '';
// TODO: We can't fully rely on basePath. For example, the "Add Credentials" form sets the basePath
// to something like admin_of_organizations. Instead, we should probably just use the model name.
// At the time, we need to account for admin_of_organizations to determine if we auto-populate org
// on the cred add page.
basePath = GetBasePath(elm.attr('data-basePath')) || elm.attr('data-basePath');
switch(modelName) {
case 'credential':
query = '?kind=ssh';
break;
case 'network_credential':
query = '?kind=net';
break;
}
Rest.setUrl(`${basePath}` + query);
Rest.get()
.success(function (data) {
// TODO: Obviously, add back in the data count
/*
if (data.count == 1) {
}
*/
scope[modelKey] = data.results[0].name;
scope[modelName] = data.results[0].id;
});
}
// TODO: Add more logic checks to see if this field needs to be auto-populated. Checks similar to the below linked code.
// https://github.com/ansible/ansible-tower/blob/release_3.0.3/awx/ui/client/src/lookup/lookup.factory.js#L94
if (scope.mode === 'add') {
_doAutoPopulate();
}
// query the API to see if field value corresponds to a valid resource
// .ng-pending will be applied to the directive element while the request is outstanding
// form.$pending will contain object reference to any ngModelControllers with outstanding requests

5
awx/ui/client/src/shared/form-generator.js
View File

@ -376,6 +376,11 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
},
applyDefaults: function (form, scope) {
// Note: This is a hack. Ideally, mode should be set in each <resource>-<mode>.controller.js
// The mode is needed by the awlookup directive to auto-populate form fields when there is a
// single related resource.
scope.mode = this.mode;
for (var fld in form.fields) {
if (form.fields[fld]['default'] || form.fields[fld]['default'] === 0) {
if (form.fields[fld].type === 'select' && scope[fld + '_options']) {