External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 22:49:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

add /#/home/hosts/?active-failures=true, resolves #1678

Browse Source
This commit is contained in:
Leigh Johnson
2016-05-02 23:59:39 -04:00
parent 5f040640fd
commit f7b5772eba
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js
View File

@@ -38,7 +38,7 @@ export default
label: "Hosts" label: "Hosts"
}, },
{ {
url: "/#/home/hosts?has_active_failures=true", url: "/#/home/hosts?active-failures=true",
number: scope.data.hosts.failed, number: scope.data.hosts.failed,
label: "Failed Hosts", label: "Failed Hosts",
isFailureCount: true isFailureCount: true

2
awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js
View File

@@ -15,7 +15,7 @@ export default function(){
index: false, index: false,
hover: true, hover: true,
well: true, well: true,
emptyListText: 'NO ACTIVE FAILURES FOUND',
fields: { fields: {
status: { status: {
basePath: 'unified_jobs', basePath: 'unified_jobs',

58
awx/ui/client/src/dashboard/hosts/dashboard-hosts.route.js
View File

@@ -9,14 +9,14 @@ import listController from './dashboard-hosts-list.controller';
import editController from './dashboard-hosts-edit.controller'; import editController from './dashboard-hosts-edit.controller';
var dashboardHostsList = { var dashboardHostsList = {
name: 'dashboardHosts', name: 'dashboardHosts',
url: '/home/hosts', url: '/home/hosts?:active-failures',
controller: listController, controller: listController,
templateUrl: templateUrl('dashboard/hosts/dashboard-hosts-list'), templateUrl: templateUrl('dashboard/hosts/dashboard-hosts-list'),
data: { data: {
activityStream: true, activityStream: true,
activityStreamTarget: 'host' activityStreamTarget: 'host'
}, },
ncyBreadcrumb: { ncyBreadcrumb: {
parent: 'dashboard', parent: 'dashboard',
label: "HOSTS" label: "HOSTS"
@@ -25,39 +25,39 @@ var dashboardHostsList = {
features: ['FeaturesService', function(FeaturesService) { features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get(); return FeaturesService.get();
}], }],
hosts: ['Rest', 'GetBasePath', function(Rest, GetBasePath){ hosts: ['Rest', 'GetBasePath', '$stateParams', function(Rest, GetBasePath, $stateParams){
var defaultUrl = GetBasePath('hosts') + '?page_size=10'; var defaultUrl = GetBasePath('hosts') + '?page_size=10' + ($stateParams['active-failures'] ? '&has_active_failures=true' : '' );
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
return Rest.get().then(function(res){ return Rest.get().then(function(res){
var results = _.map(res.data.results, function(value){ var results = _.map(res.data.results, function(value){
value.inventory_name = value.summary_fields.inventory.name; value.inventory_name = value.summary_fields.inventory.name;
value.inventory_id = value.summary_fields.inventory.id; value.inventory_id = value.summary_fields.inventory.id;
return value; return value;
}); });
res.data.results = results; res.data.results = results;
return res.data; return res.data;
}); });
}] }]
} }
}; };
var dashboardHostsEdit = { var dashboardHostsEdit = {
name: 'dashboardHosts.edit', name: 'dashboardHosts.edit',
url: '/:id', url: '/:id',
controller: editController, controller: editController,
templateUrl: templateUrl('dashboard/hosts/dashboard-hosts-edit'), templateUrl: templateUrl('dashboard/hosts/dashboard-hosts-edit'),
ncyBreadcrumb: { ncyBreadcrumb: {
parent: 'dashboardHosts', parent: 'dashboardHosts',
label: "{{host.name}}" label: "{{host.name}}"
}, },
resolve: { resolve: {
host: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath){ host: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath){
var defaultUrl = GetBasePath('hosts') + '?id=' + $stateParams.id; var defaultUrl = GetBasePath('hosts') + '?id=' + $stateParams.id;
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
return Rest.get().then(function(res){ return Rest.get().then(function(res){
return res.data.results[0]; return res.data.results[0];
}); });
}] }]
} }
}; };