LogViewer wired into home/hosts page.

This commit is contained in:
Chris Houseknecht 2014-04-04 19:58:02 -04:00
parent 06db369757
commit 602f26f891
3 changed files with 15 additions and 5 deletions

2
.gitignore vendored
View File

@ -7,6 +7,8 @@ awx/public/media
awx/public/static
awx/ui/static/js/awx.min.js
awx/ui/static/css/awx.min.css
awx/tower_warnings.log
celerybeat-schedule
env/*
node_modules/**
build

View File

@ -494,7 +494,7 @@ HomeGroups.$inject = ['$scope', '$filter', '$compile', '$location', '$routeParam
function HomeHosts($scope, $location, $routeParams, HomeHostList, GenerateList, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope,
GetBasePath, SearchInit, PaginateInit, FormatDate, SetStatus, ToggleHostEnabled, HostsEdit, Stream, Find, ShowJobSummary) {
GetBasePath, SearchInit, PaginateInit, FormatDate, SetStatus, ToggleHostEnabled, HostsEdit, Stream, Find, ShowJobSummary, ViewJob) {
ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
//scope.
@ -503,8 +503,6 @@ function HomeHosts($scope, $location, $routeParams, HomeHostList, GenerateList,
list = HomeHostList,
defaultUrl = GetBasePath('hosts');
generator.inject(list, { mode: 'edit', scope: $scope });
if ($scope.removePostRefresh) {
$scope.removePostRefresh();
}
@ -517,6 +515,9 @@ function HomeHosts($scope, $location, $routeParams, HomeHostList, GenerateList,
host: $scope.hosts[i]
});
}
generator.inject(list, { mode: 'edit', scope: $scope });
});
SearchInit({
@ -560,6 +561,10 @@ function HomeHosts($scope, $location, $routeParams, HomeHostList, GenerateList,
LoadBreadCrumbs();
$scope.viewJob = function(id) {
ViewJob({ scope: $scope, id: id });
};
$scope.showActivity = function () {
Stream({
scope: $scope
@ -602,5 +607,5 @@ function HomeHosts($scope, $location, $routeParams, HomeHostList, GenerateList,
HomeHosts.$inject = ['$scope', '$location', '$routeParams', 'HomeHostList', 'GenerateList', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller',
'ClearScope', 'GetBasePath', 'SearchInit', 'PaginateInit', 'FormatDate', 'SetStatus', 'ToggleHostEnabled', 'HostsEdit', 'Stream',
'Find', 'ShowJobSummary'
'Find', 'ShowJobSummary', 'ViewJob'
];

View File

@ -27,7 +27,10 @@ angular.module('HomeHostListDefinition', [])
iconOnly: true,
icon: "{{ 'icon-job-' + host.active_failures }}",
awToolTip: "{{ host.badgeToolTip }}",
dataTitle: "{{ host.job_status_title }}",
awTipPlacement: "top",
dataPlacement: "right",
awPopOver: "{{ host.job_status_html }}",
ngClick:"bob",
columnClass: "col-md-1 col-sm-2 col-xs-3",
searchable: false,
@ -37,7 +40,7 @@ angular.module('HomeHostListDefinition', [])
key: true,
label: 'Name',
columnClass: 'col-lg-4 col-md3 col-sm-3 col-xs-7 ellipsis',
ngClick: "editHost(host.id, host.name)"
ngClick: "editHost(host.id)"
},
inventory_name: {
label: 'Inventory',