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

fixing insights cred lookup on inventory

Browse Source
This commit is contained in:
Jared Tabor 2017-06-14 13:39:09 -07:00
parent eecdc9eb5e
commit 1ad6d8d8b8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/inventories/standard/edit/inventory-edit.controller.js
View File

@ -30,7 +30,8 @@ function InventoriesEdit($scope, $location,
$scope = angular.extend($scope, inventoryData); $scope = angular.extend($scope, inventoryData);
$scope.credential_name = (inventoryData.summary_fields.insights_credential && inventoryData.summary_fields.insights_credential.name) ? inventoryData.summary_fields.insights_credential.name : null; $scope.insights_credential_name = (inventoryData.summary_fields.insights_credential && inventoryData.summary_fields.insights_credential.name) ? inventoryData.summary_fields.insights_credential.name : null;
$scope.insights_credential = (inventoryData.summary_fields.insights_credential && inventoryData.summary_fields.insights_credential.id) ? inventoryData.summary_fields.insights_credential.id : null;
$scope.organization_name = inventoryData.summary_fields.organization.name; $scope.organization_name = inventoryData.summary_fields.organization.name;
$scope.inventory_variables = inventoryData.variables === null || inventoryData.variables === '' ? '---' : ParseVariableString(inventoryData.variables); $scope.inventory_variables = inventoryData.variables === null || inventoryData.variables === '' ? '---' : ParseVariableString(inventoryData.variables);
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';

2
awx/ui/client/src/inventories/standard/inventory.form.js
View File

@ -73,7 +73,7 @@ function(i18n, InventoryCompletedJobsList) {
type: 'lookup', type: 'lookup',
list: 'CredentialList', list: 'CredentialList',
basePath: 'credentials', basePath: 'credentials',
sourceModel: 'credential', sourceModel: 'insights_credential',
sourceField: 'name', sourceField: 'name',
search: { search: {
credential_type: 13 //insights credential_type: 13 //insights