External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-21 15:57:52 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix Azure RM credential lookup in Inventory > Manage > Group Add/Edit, resolves #2188 (#2195)

Browse Source
This commit is contained in:
Leigh
2016-06-08 10:32:43 -04:00
parent 27d6ccc2ea
commit 7506ee3509
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
View File

@@ -19,7 +19,7 @@
var params, source; var params, source;
// group fields // group fields
var group = { var group = {
variables: $scope.variables === ('---' || '{}') ? null : $scope.variables, variables: $scope.variables === '---' || $scope.variables === '{}' ? null : $scope.variables,
name: $scope.name, name: $scope.name,
description: $scope.description, description: $scope.description,
inventory: inventoryData.id inventory: inventoryData.id
@@ -28,7 +28,7 @@
// inventory_source fields // inventory_source fields
params = { params = {
instance_filters: $scope.instance_filters, instance_filters: $scope.instance_filters,
source_vars: $scope[$scope.source.value + '_variables'] === ('---' || '{}') ? null : $scope[$scope.source.value + '_variables'], source_vars: $scope[$scope.source.value + '_variables'] === '---' || $scope[$scope.source.value + '_variables'] === '{}' ? null : $scope[$scope.source.value + '_variables'],
source_script: $scope.inventory_script, source_script: $scope.inventory_script,
source: $scope.source.value, source: $scope.source.value,
credential: $scope.credential, credential: $scope.credential,
@@ -82,7 +82,7 @@
} }
}; };
$scope.sourceChange = function(source){ $scope.sourceChange = function(source){
source = source.value === 'azure_rm' ? 'azure' : source.value; source = source.value;
if (source === 'custom'){ if (source === 'custom'){
LookUpInit({ LookUpInit({
scope: $scope, scope: $scope,

4
awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
View File

@@ -20,7 +20,7 @@
var params, source; var params, source;
// group fields // group fields
var group = { var group = {
variables: $scope.variables === ('---' || '{}') ? null : $scope.variables, variables: $scope.variables === '---' || $scope.variables === '{}' ? null : $scope.variables,
name: $scope.name, name: $scope.name,
description: $scope.description, description: $scope.description,
inventory: $scope.inventory, inventory: $scope.inventory,
@@ -233,7 +233,7 @@
if (inventorySourceData.source !== 'custom'){ if (inventorySourceData.source !== 'custom'){
LookUpInit({ LookUpInit({
scope: $scope, scope: $scope,
url: GetBasePath('credentials') + (inventorySourceData.source === '' ? '' : 'kind=' + (inventorySourceData.source)), url: GetBasePath('credentials') + (inventorySourceData.source === '' ? '' : '?kind=' + (inventorySourceData.source)),
form: form, form: form,
list: CredentialList, list: CredentialList,
field: 'credential', field: 'credential',