diff --git a/awx/ui/static/js/controllers/Home.js b/awx/ui/static/js/controllers/Home.js index 993f6638d9..27aa25f14c 100644 --- a/awx/ui/static/js/controllers/Home.js +++ b/awx/ui/static/js/controllers/Home.js @@ -249,9 +249,9 @@ function HomeHosts ($location, $routeParams, HomeHostList, GenerateList, Process // Process search params if ($routeParams['name']) { scope[HomeHostList.iterator + 'InputDisable'] = false; - scope[HomeHostListiterator + 'SearchValue'] = $routeParams['name']; + scope[HomeHostList.iterator + 'SearchValue'] = $routeParams['name']; scope[HomeHostList.iterator + 'SearchField'] = 'name'; - scope[lHomeHostList.iterator + 'SearchFieldLabel'] = list.fields['name'].label; + scope[HomeHostList.iterator + 'SearchFieldLabel'] = list.fields['name'].label; } if ($routeParams['has_active_failures']) { @@ -267,7 +267,7 @@ function HomeHosts ($location, $routeParams, HomeHostList, GenerateList, Process LoadBreadCrumbs(); scope.showActivity = function() { Stream(); } - scope.toggle_host_enabled = function(id, sources) { ToggleHostEnabled(id, sources, scope); } + scope.toggle_host_enabled = function(id, sources) { ToggleHostEnabled({ host_id: id, external_source: sources, scope: scope }); } scope.editHost = function(host_id, host_name) { var host; diff --git a/awx/ui/static/js/lists/HomeHosts.js b/awx/ui/static/js/lists/HomeHosts.js index bf6ad89182..da95f036fc 100644 --- a/awx/ui/static/js/lists/HomeHosts.js +++ b/awx/ui/static/js/lists/HomeHosts.js @@ -39,7 +39,7 @@ angular.module('HomeHostListDefinition', []) awToolTip: "\{\{ host.badgeToolTip \}\}", dataPlacement: 'top', badgeNgHref: '\{\{ host.activeFailuresLink \}\}', - badgeIcon: "\{\{ 'icon-failures-' + host.has_active_failures \}\}", + badgeIcon: "\{\{ 'fa icon-failures-' + host.has_active_failures \}\}", badgePlacement: 'left', badgeToolTip: "\{\{ host.badgeToolTip \}\}", badgeTipPlacement: 'top', @@ -48,7 +48,7 @@ angular.module('HomeHostListDefinition', []) }, enabled_flag: { label: 'Enabled', - badgeIcon: "\{\{ 'icon-enabled-' + host.enabled \}\}", + badgeIcon: "\{\{ 'fa icon-enabled-' + host.enabled \}\}", badgePlacement: 'left', badgeToolTip: "\{\{ host.enabledToolTip \}\}", badgeTipPlacement: "top", @@ -89,6 +89,4 @@ angular.module('HomeHostListDefinition', []) } }, - fieldActions: { - } }); diff --git a/awx/ui/static/js/widgets/Stream.js b/awx/ui/static/js/widgets/Stream.js index b31d116604..51f1a8444f 100644 --- a/awx/ui/static/js/widgets/Stream.js +++ b/awx/ui/static/js/widgets/Stream.js @@ -239,7 +239,8 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti if (paths.length > 1 && /^\d+/.test(paths[paths.length - 1])) { type = paths[paths.length - 2]; type = (type == 'inventories') ? 'inventory' : type.replace(/s$/,''); - defaultUrl += '?object1=' + type + '&object1_id=' + paths[paths.length - 1]; + //defaultUrl += '?object1=' + type + '&object1__id=' + + defaultUrl += '?' + type + '__id=' + paths[paths.length - 1]; } else if (paths.length > 1) { type = paths[paths.length - 1]; diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index 88dcff3f73..32a42de018 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -712,6 +712,10 @@ input[type="checkbox"].checkbox-no-label { } } +#home-list-actions { + margin-bottom: 15px; +} + /* End Display list actions */ @@ -1300,6 +1304,10 @@ tr td button i { display: none; border-radius: 8px; z-index: 20; /* has to be greater than tree selector */ + + .nav-path { + margin-bottom: 15px; + } } #stream-content {