mirror of
https://github.com/ansible/awx.git
synced 2024-10-30 22:21:13 +03:00
Activity Stream: fixed activity steam query build when called for specific objects. Fixed minor style issues.
This commit is contained in:
parent
3a4899e04a
commit
fe40f3adf5
@ -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;
|
||||
|
@ -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: {
|
||||
}
|
||||
});
|
||||
|
@ -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];
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user