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

changed Group filter on home/groups and inventories-> groups to include cloud credentials

Browse Source
This commit is contained in:
Jared Tabor
2014-08-18 11:45:10 -04:00
parent caff0572a5
commit 172400999d
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/controllers/Home.js
View File

@@ -319,7 +319,7 @@ function HomeGroups($log, $scope, $filter, $compile, $location, $routeParams, Lo
} }
if ($routeParams.status) { if ($routeParams.status) {
scope[list.iterator + 'ExtraParms'] = '&inventory_source__status__icontains=' + $routeParams.status; scope[list.iterator + 'ExtraParms'] = 'inventory_source__status__icontains=' + $routeParams.status;
} }
} }

15
awx/ui/static/js/lists/HomeGroups.js
View File

@@ -60,14 +60,23 @@ angular.module('HomeGroupListDefinition', [])
label: 'Source', label: 'Source',
searchType: 'select', searchType: 'select',
searchOptions: [{ searchOptions: [{
name: "ec2", name: "Amazon Web Services",
value: "ec2" value: "ec2"
}, { }, {
name: "none", name: "none",
value: "" value: ""
}, { }, {
name: "rax", name: "Rackspace",
value: "rax" value: "rax"
},{
name: "VMware",
value: "vmware"
},{
name: "Google Compute Engine",
value: "gce"
},{
name: "Microsoft Azure",
value: "azure"
}], }],
sourceModel: 'inventory_source', sourceModel: 'inventory_source',
sourceField: 'source', sourceField: 'source',
@@ -76,7 +85,7 @@ angular.module('HomeGroupListDefinition', [])
has_external_source: { has_external_source: {
label: 'Has external source?', label: 'Has external source?',
searchType: 'in', searchType: 'in',
searchValue: 'ec2,rax', searchValue: 'ec2,rax,vmware,azure,gce',
searchOnly: true, searchOnly: true,
sourceModel: 'inventory_source', sourceModel: 'inventory_source',
sourceField: 'source' sourceField: 'source'

15
awx/ui/static/js/lists/InventoryGroups.js
View File

@@ -28,14 +28,23 @@ angular.module('InventoryGroupsDefinition', [])
label: 'Source', label: 'Source',
searchType: 'select', searchType: 'select',
searchOptions: [{ searchOptions: [{
name: "ec2", name: "Amazon Web Services",
value: "ec2" value: "ec2"
}, { }, {
name: "none", name: "none",
value: "" value: ""
}, { }, {
name: "rax", name: "Rackspace",
value: "rax" value: "rax"
},{
name: "VMware",
value: "vmware"
},{
name: "Google Compute Engine",
value: "gce"
},{
name: "Microsoft Azure",
value: "azure"
}], }],
sourceModel: 'inventory_source', sourceModel: 'inventory_source',
sourceField: 'source', sourceField: 'source',
@@ -44,7 +53,7 @@ angular.module('InventoryGroupsDefinition', [])
has_external_source: { has_external_source: {
label: 'Has external source?', label: 'Has external source?',
searchType: 'in', searchType: 'in',
searchValue: 'ec2,rax', searchValue: 'ec2,rax,vmware,azure,gce',
searchOnly: true, searchOnly: true,
sourceModel: 'inventory_source', sourceModel: 'inventory_source',
sourceField: 'source' sourceField: 'source'