diff --git a/awx/ui/static/js/widgets/InventorySyncStatus.js b/awx/ui/static/js/widgets/InventorySyncStatus.js index 1aa341f4cf..ed2555660c 100644 --- a/awx/ui/static/js/widgets/InventorySyncStatus.js +++ b/awx/ui/static/js/widgets/InventorySyncStatus.js @@ -7,6 +7,8 @@ * */ +'use strict'; + angular.module('InventorySyncStatusWidget', ['RestServices', 'Utilities']) .factory('InventorySyncStatus', ['$rootScope', '$compile', 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait', 'GetChoices', function($rootScope, $compile, Rest, GetBasePath, ProcessErrors, Wait, GetChoices) { @@ -51,9 +53,9 @@ angular.module('InventorySyncStatusWidget', ['RestServices', 'Utilities']) } html += makeRow({ label: 'Inventories', - count: [(dashboard.inventories && dashboard.inventories.total_with_inventory_source) ? - dashboard.inventories.total_with_inventory_source : 0 ], - fail: [(dashboard.inventories && dashboard.inventories.inventory_failed) ? dashboard.inventories.inventory_failed : 0], + count: (dashboard.inventories && dashboard.inventories.total_with_inventory_source) ? + dashboard.inventories.total_with_inventory_source : 0, + fail: (dashboard.inventories && dashboard.inventories.inventory_failed) ? dashboard.inventories.inventory_failed : 0, link: '/#/inventories/?has_inventory_sources=true', fail_link: '/#/inventories/?inventory_sources_with_failures=true' }); @@ -78,8 +80,8 @@ angular.module('InventorySyncStatusWidget', ['RestServices', 'Utilities']) for (var src in dashboard.inventory_sources) { if (dashboard.inventory_sources[src].total) { html += makeRow({ label: dashboard.inventory_sources[src].label, - count: [(dashboard.inventory_sources[src].total) ? dashboard.inventory_sources[src].total : 0], - fail: [(dashboard.inventory_sources[src].failed) ? dashboard.inventory_sources[src].failed : 0], + count: (dashboard.inventory_sources[src].total) ? dashboard.inventory_sources[src].total : 0, + fail: (dashboard.inventory_sources[src].failed) ? dashboard.inventory_sources[src].failed : 0, link: '/#/home/groups/?source=' + src, fail_link: '/#/home/groups/?status=failed&source=' + src }); diff --git a/awx/ui/static/js/widgets/JobStatus.js b/awx/ui/static/js/widgets/JobStatus.js index 6a5def9bc3..504da41338 100644 --- a/awx/ui/static/js/widgets/JobStatus.js +++ b/awx/ui/static/js/widgets/JobStatus.js @@ -7,6 +7,8 @@ * */ +'use strict'; + angular.module('JobStatusWidget', ['RestServices', 'Utilities']) .factory('JobStatus', ['$rootScope', '$compile', 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait', function($rootScope, $compile, Rest, GetBasePath, ProcessErrors, Wait) { @@ -55,29 +57,29 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities']) html += makeRow({ label: 'Jobs', link: '/#/jobs', - count: [(dashboard.jobs && dashboard.jobs.total) ? dashboard.jobs.total : 0], - fail: [(dashboard.jobs && dashboard.jobs.failed) ? dashboard.jobs.failed : 0], + count: (dashboard.jobs && dashboard.jobs.total) ? dashboard.jobs.total : 0, + fail: (dashboard.jobs && dashboard.jobs.failed) ? dashboard.jobs.failed : 0, fail_link: '/#/jobs/?status=failed' }); html += makeRow({ label: 'Inventories', link: '/#/inventories', - count: [(dashboard.inventories && dashboard.inventories.total) ? dashboard.inventories.total : 0], - fail: [(dashboard.inventories && dashboard.inventories.job_failed) ? dashboard.inventories.job_failed : 0], + count: (dashboard.inventories && dashboard.inventories.total) ? dashboard.inventories.total : 0, + fail: (dashboard.inventories && dashboard.inventories.job_failed) ? dashboard.inventories.job_failed : 0, fail_link: '/#/inventories/?has_active_failures=true' }); html += makeRow({ label: 'Groups', link: '/#/home/groups', - count: [(dashboard.groups && dashboard.groups.total) ? dashboard.groups.total : 0], - fail: [(dashboard.groups && dashboard.groups.job_failed) ? dashboard.groups.job_failed : 0], + count: (dashboard.groups && dashboard.groups.total) ? dashboard.groups.total : 0, + fail: (dashboard.groups && dashboard.groups.job_failed) ? dashboard.groups.job_failed : 0, fail_link: '/#/home/groups/?has_active_failures=true' }); html += makeRow({ label: 'Hosts', link: '/#/home/hosts', - count: [(dashboard.hosts && dashboard.hosts.total) ? dashboard.hosts.total : 0], - fail: [(dashboard.hosts && dashboard.hosts.failed) ? dashboard.hosts.failed : 0], + count: (dashboard.hosts && dashboard.hosts.total) ? dashboard.hosts.total : 0, + fail: (dashboard.hosts && dashboard.hosts.failed) ? dashboard.hosts.failed : 0, fail_link: '/#/home/hosts/?has_active_failures=true' }); diff --git a/awx/ui/static/js/widgets/ObjectCount.js b/awx/ui/static/js/widgets/ObjectCount.js index 33a5eb0a0b..eb9503dc3c 100644 --- a/awx/ui/static/js/widgets/ObjectCount.js +++ b/awx/ui/static/js/widgets/ObjectCount.js @@ -7,6 +7,7 @@ * */ +'use strict'; angular.module('ObjectCountWidget', ['RestServices', 'Utilities']) .factory('ObjectCount', ['$rootScope', '$compile', 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait', @@ -21,7 +22,7 @@ angular.module('ObjectCountWidget', ['RestServices', 'Utilities']) var keys=[ 'organizations', 'users', 'teams', 'credentials', 'projects', 'inventories', 'groups', 'hosts', 'job_templates', 'jobs' ]; - html = "