diff --git a/awx/ui/static/js/controllers/Home.js b/awx/ui/static/js/controllers/Home.js index c03cffe8af..2fd52b61af 100644 --- a/awx/ui/static/js/controllers/Home.js +++ b/awx/ui/static/js/controllers/Home.js @@ -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; } } diff --git a/awx/ui/static/js/lists/HomeGroups.js b/awx/ui/static/js/lists/HomeGroups.js index 04b9caf140..84b33eb10d 100644 --- a/awx/ui/static/js/lists/HomeGroups.js +++ b/awx/ui/static/js/lists/HomeGroups.js @@ -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' diff --git a/awx/ui/static/js/lists/InventoryGroups.js b/awx/ui/static/js/lists/InventoryGroups.js index f3e0af4cba..7594af6d8d 100644 --- a/awx/ui/static/js/lists/InventoryGroups.js +++ b/awx/ui/static/js/lists/InventoryGroups.js @@ -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'