mirror of
https://github.com/ansible/awx.git
synced 2024-10-31 23:51:09 +03:00
changed Group filter on home/groups and inventories-> groups to include cloud credentials
This commit is contained in:
parent
caff0572a5
commit
172400999d
@ -319,7 +319,7 @@ function HomeGroups($log, $scope, $filter, $compile, $location, $routeParams, Lo
|
||||
}
|
||||
|
||||
if ($routeParams.status) {
|
||||
scope[list.iterator + 'ExtraParms'] = '&inventory_source__status__icontains=' + $routeParams.status;
|
||||
scope[list.iterator + 'ExtraParms'] = 'inventory_source__status__icontains=' + $routeParams.status;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -60,14 +60,23 @@ angular.module('HomeGroupListDefinition', [])
|
||||
label: 'Source',
|
||||
searchType: 'select',
|
||||
searchOptions: [{
|
||||
name: "ec2",
|
||||
name: "Amazon Web Services",
|
||||
value: "ec2"
|
||||
}, {
|
||||
name: "none",
|
||||
value: ""
|
||||
}, {
|
||||
name: "rax",
|
||||
name: "Rackspace",
|
||||
value: "rax"
|
||||
},{
|
||||
name: "VMware",
|
||||
value: "vmware"
|
||||
},{
|
||||
name: "Google Compute Engine",
|
||||
value: "gce"
|
||||
},{
|
||||
name: "Microsoft Azure",
|
||||
value: "azure"
|
||||
}],
|
||||
sourceModel: 'inventory_source',
|
||||
sourceField: 'source',
|
||||
@ -76,7 +85,7 @@ angular.module('HomeGroupListDefinition', [])
|
||||
has_external_source: {
|
||||
label: 'Has external source?',
|
||||
searchType: 'in',
|
||||
searchValue: 'ec2,rax',
|
||||
searchValue: 'ec2,rax,vmware,azure,gce',
|
||||
searchOnly: true,
|
||||
sourceModel: 'inventory_source',
|
||||
sourceField: 'source'
|
||||
|
@ -28,14 +28,23 @@ angular.module('InventoryGroupsDefinition', [])
|
||||
label: 'Source',
|
||||
searchType: 'select',
|
||||
searchOptions: [{
|
||||
name: "ec2",
|
||||
name: "Amazon Web Services",
|
||||
value: "ec2"
|
||||
}, {
|
||||
name: "none",
|
||||
value: ""
|
||||
}, {
|
||||
name: "rax",
|
||||
name: "Rackspace",
|
||||
value: "rax"
|
||||
},{
|
||||
name: "VMware",
|
||||
value: "vmware"
|
||||
},{
|
||||
name: "Google Compute Engine",
|
||||
value: "gce"
|
||||
},{
|
||||
name: "Microsoft Azure",
|
||||
value: "azure"
|
||||
}],
|
||||
sourceModel: 'inventory_source',
|
||||
sourceField: 'source',
|
||||
@ -44,7 +53,7 @@ angular.module('InventoryGroupsDefinition', [])
|
||||
has_external_source: {
|
||||
label: 'Has external source?',
|
||||
searchType: 'in',
|
||||
searchValue: 'ec2,rax',
|
||||
searchValue: 'ec2,rax,vmware,azure,gce',
|
||||
searchOnly: true,
|
||||
sourceModel: 'inventory_source',
|
||||
sourceField: 'source'
|
||||
|
Loading…
Reference in New Issue
Block a user