shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Merge pull request #484 from jaredevantabor/insights

Browse Source 
Insights
This commit is contained in:
Jared Tabor 2017-09-29 12:42:38 -07:00 committed by GitHub
commit 3d71c93262
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js
View File

@ -72,9 +72,6 @@ function(i18n, InventoryCompletedJobsList) {
basePath: 'credentials',
sourceModel: 'insights_credential',
sourceField: 'name',
search: {
credential_type: '13' //insights
},
ngDisabled: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd) || !canEditOrg',
},
instance_groups: {

35
awx/ui/client/src/shared/stateDefinitions.factory.js
View File

@ -722,7 +722,8 @@ function($injector, $stateExtender, $log, i18n) {
function buildFieldDefinition(field) {
// Some lookup modals require some additional default params,
// namely organization and inventory_script. If these params
// namely organization and inventory_script, and insights
// credentials. If these params
// aren't set as default params out of the gate, then smart
// search will think they need to be set as search tags.
var params;
@ -739,6 +740,13 @@ function($injector, $stateExtender, $log, i18n) {
organization: null
};
}
else if(field.sourceModel === "insights_credential"){
params = {
page_size: '5',
role_level: 'admin_role',
credential_type: null
};
}
else if(field.sourceModel === 'host') {
params = {
page_size: '5'
@ -805,8 +813,24 @@ function($injector, $stateExtender, $log, i18n) {
return;
}
}],
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope', '$state', 'OrganizationId',
(list, qs, $stateParams, GetBasePath, $interpolate, $rootScope, $state, OrganizationId) => {
InsightsCredTypePK: ['ListDefinition', 'Rest', 'GetBasePath', 'ProcessErrors',
function(list, Rest, GetBasePath,ProcessErrors) {
if(list.iterator === 'insights_credential'){
Rest.setUrl(GetBasePath('credential_types') + '?name=Insights');
return Rest.get()
.then(({data}) => {
return data.results[0].id;
})
.catch(({data, status}) => {
ProcessErrors(null, data, status, null, {
hdr: 'Error!',
msg: 'Failed to get credential type data: ' + status
});
});
}
}],
Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope', '$state', 'OrganizationId', 'InsightsCredTypePK',
(list, qs, $stateParams, GetBasePath, $interpolate, $rootScope, $state, OrganizationId, InsightsCredTypePK) => {
// allow lookup field definitions to use interpolated $stateParams / $rootScope in basePath field
// the basePath on a form's lookup field will take precedence over the general model list's basepath
let path, interpolator;
@ -830,6 +854,11 @@ function($injector, $stateExtender, $log, i18n) {
$stateParams[`${list.iterator}_search`].role_level = "admin_role";
$stateParams[`${list.iterator}_search`].organization = OrganizationId;
}
if(list.iterator === "insights_credential"){
$stateParams[`${list.iterator}_search`].role_level = "admin_role";
$stateParams[`${list.iterator}_search`].credential_type = InsightsCredTypePK.toString() ;
}
return qs.search(path, $stateParams[`${list.iterator}_search`]);
}