External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 19:10:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1644 from jaredevantabor/activity-stream-fixes

Browse Source 
Activity stream fixes
This commit is contained in:
Jake McDermott 2018-05-01 19:34:41 -04:00 committed by GitHub
commit b64990562a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/features/jobs/routes/jobs.route.js
View File

@ -22,6 +22,8 @@ export default {
}
},
data: {
activityStream: true,
activityStreamTarget: 'job',
socket: {
groups: {
jobs: ['status_changed'],

3
awx/ui/client/features/output/index.js
View File

@ -169,8 +169,7 @@ function JobsRun ($stateRegistry) {
url: '/jobz/:type/:id?job_event_search',
route: '/jobz/:type/:id?job_event_search',
data: {
activityStream: true,
activityStreamTarget: 'jobs'
activityStream: false,
},
views: {
'@': {

2
awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
View File

@ -38,7 +38,7 @@ export default function BuildAnchor($log, $filter) {
case 'schedule':
// schedule urls depend on the resource they're associated with
if (activity.summary_fields.job_template){
url += 'job_templates/' + activity.summary_fields.job_template.id + '/schedules/' + obj.id;
url += 'templates/job_template/' + activity.summary_fields.job_template.id + '/schedules/' + obj.id;
}
else if (activity.summary_fields.project){
url += 'projects/' + activity.summary_fields.project.id + '/schedules/' + obj.id;