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

Merge pull request #4944 from jlmitch5/changeResultsToDetails

Browse Source 
fix host event modal from using parent
This commit is contained in:
jlmitch5
2017-01-25 17:24:26 -05:00
committed by GitHub
parent ebf5c85238 3ea70a75ee
commit c5625c6779
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/job-detail/host-event/host-event.route.js
View File

@@ -20,7 +20,7 @@ var hostEventModal = {
return res.data.results[0]; }); return res.data.results[0]; });
}], }],
hostResults: ['JobDetailService', '$stateParams', function(JobDetailService, $stateParams) { hostResults: ['JobDetailService', '$stateParams', function(JobDetailService, $stateParams) {
return JobDetailService.getJobEventChildren($stateParams.taskId).then(res => res.data.results); return JobDetailService.getJobEventChildren($stateParams.taskUuid).then(res => res.data.results);
}] }]
}, },
onExit: function() { onExit: function() {

4
awx/ui/client/src/job-detail/job-detail.service.js
View File

@@ -129,9 +129,9 @@ export default
msg: 'Call to ' + url + '. GET returned: ' + status }); msg: 'Call to ' + url + '. GET returned: ' + status });
}); });
}, },
getJobEventChildren: function(id){ getJobEventChildren: function(uuid){
var url = GetBasePath('job_events'); var url = GetBasePath('job_events');
url = url + id + '/children/?order_by=host_name'; url = `${url}?parent__uuid=${uuid}&order_by=host_name`;
Rest.setUrl(url); Rest.setUrl(url);
return Rest.get() return Rest.get()
.success(function(data){ .success(function(data){

2
awx/ui/client/src/job-results/host-event/host-event.route.js
View File

@@ -8,7 +8,7 @@ import { templateUrl } from '../../shared/template-url/template-url.factory';
var hostEventModal = { var hostEventModal = {
name: 'jobDetail.host-event', name: 'jobDetail.host-event',
url: '/task/:taskId/host-event/:eventId', url: '/host-event/:eventId',
controller: 'HostEventController', controller: 'HostEventController',
templateUrl: templateUrl('job-results/host-event/host-event-modal'), templateUrl: templateUrl('job-results/host-event/host-event-modal'),
'abstract': false, 'abstract': false,

2
awx/ui/client/src/job-results/parse-stdout.service.js
View File

@@ -70,7 +70,7 @@ export default ['$log', 'moment', function($log, moment){
return `"`; return `"`;
} }
else{ else{
return ` JobResultsStdOut-stdoutColumn--clickable" ui-sref="jobDetail.host-event.stdout({eventId: ${event.id}, taskId: ${event.parent} })" aw-tool-tip="Event ID: ${event.id} <br>Status: ${event.event_display} <br>Click for details" data-placement="top"`; return ` JobResultsStdOut-stdoutColumn--clickable" ui-sref="jobDetail.host-event.stdout({eventId: ${event.id}, taskUuid: '${event.event_data.task_uuid}' })" aw-tool-tip="Event ID: ${event.id} <br>Status: ${event.event_display} <br>Click for details" data-placement="top"`;
} }
}, },