External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5474 from jlmitch5/fixRecentJobRunsList

Browse Source 
include workflows on dashboard recent job runs list
This commit is contained in:
jlmitch5
2017-02-22 14:37:00 -05:00
committed by GitHub
parent d56317a161 de4aeb064c
commit 365659051e
6 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/controllers/Home.js
View File

@@ -38,7 +38,7 @@ export function Home($scope, $compile, $stateParams, $rootScope, $location, $log
ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard host graph data: ' + status }); ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard host graph data: ' + status });
}); });
Rest.setUrl(GetBasePath("jobs") + "?order_by=-finished&page_size=5&finished__isnull=false"); Rest.setUrl("api/v1/unified_jobs?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job");
Rest.get() Rest.get()
.success(function (data) { .success(function (data) {
$scope.dashboardJobsListData = data.results; $scope.dashboardJobsListData = data.results;
@@ -114,7 +114,7 @@ export function Home($scope, $compile, $stateParams, $rootScope, $location, $log
.error(function (data, status) { .error(function (data, status) {
ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard: ' + status }); ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard: ' + status });
}); });
Rest.setUrl(GetBasePath("jobs") + "?order_by=-finished&page_size=5&finished__isnull=false"); Rest.setUrl("api/v1/unified_jobs?order_by=-finished&page_size=5&finished__isnull=false&type=workflow_job,job");
Rest.get() Rest.get()
.success(function (data) { .success(function (data) {
data = data.results; data = data.results;

12
awx/ui/client/src/dashboard/lists/dashboard-list.block.less
View File

@@ -86,6 +86,18 @@
color: @default-err; color: @default-err;
} }
.DashboardList-status--failed{
color: @default-err;
margin-top: 10px;
margin-bottom: 10px;
padding: 0px;
margin-right: 5px;
}
.DashboardList-status--failed:before {
content: "\f06a";
}
.DashboardList-nameCell { .DashboardList-nameCell {
padding-left: 15px; padding-left: 15px;
width: 100%; width: 100%;

2
awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html
View File

@@ -30,7 +30,7 @@
</a> </a>
</td> </td>
<td class="DashboardList-activityCell"> <td class="DashboardList-activityCell">
<aw-smart-status jobs="template.recent_jobs"></aw-smart-status> <aw-smart-status jobs="template.recent_jobs" template-type="template.type"></aw-smart-status>
</td> </td>
<td class="List-actionsContainer"> <td class="List-actionsContainer">
<div class="List-actionButtonCell"> <div class="List-actionButtonCell">

2
awx/ui/client/src/dashboard/lists/jobs/jobs-list.directive.js
View File

@@ -29,7 +29,7 @@ export default
// detailsUrl, status, name, time // detailsUrl, status, name, time
scope.jobs = _.map(list, function(job){ scope.jobs = _.map(list, function(job){
return { return {
detailsUrl: job.url.replace("api/v1", "#"), detailsUrl: job.type && job.type === 'workflow_job' ? job.url.replace("api/v1/workflow_jobs", "#/workflows") : job.url.replace("api/v1", "#"),
status: job.status, status: job.status,
name: job.name, name: job.name,
id: job.id, id: job.id,

2
awx/ui/client/src/partials/organizations-job-template-smart-status.html
View File

@@ -1 +1 @@
<aw-smart-status jobs="template.summary_fields.recent_jobs"></aw-smart-status> <aw-smart-status jobs="template.summary_fields.recent_jobs" template-type="template.type"></aw-smart-status>

2
awx/ui/client/src/partials/scan-job-template-smart-status.html
View File

@@ -1 +1 @@
<aw-smart-status jobs="scan_job_template.summary_fields.recent_jobs"></aw-smart-status> <aw-smart-status jobs="scan_job_template.summary_fields.recent_jobs" template-type="template.type"></aw-smart-status>