shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

improve verbiage in activity stream for associating/disassociating wf nodes

Browse Source
This commit is contained in:
Keith Grant 2019-03-25 10:58:49 -04:00
parent 1d03625b27
commit 685f4018f2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ export default function BuildAnchor($log, $filter) {
// catch-all case to avoid generating urls if a resource has been deleted // catch-all case to avoid generating urls if a resource has been deleted
// if a resource still exists, it'll be serialized in the activity's summary_fields // if a resource still exists, it'll be serialized in the activity's summary_fields
if (!activity.summary_fields[resource]){ if (!activity.summary_fields[resource]){
console.log(activity);
throw {name : 'ResourceDeleted', message: 'The referenced resource no longer exists'}; throw {name : 'ResourceDeleted', message: 'The referenced resource no longer exists'};
} }
let name; let name;

16
awx/ui/client/src/activity-stream/factories/build-description.factory.js
View File

@ -85,8 +85,12 @@ export default function BuildDescription(BuildAnchor, $log, i18n) {
'from ' + activity.object1 + BuildAnchor(activity.summary_fields.group[0], activity.object1, activity); 'from ' + activity.object1 + BuildAnchor(activity.summary_fields.group[0], activity.object1, activity);
} }
else { else {
activity.description += activity.object2 + BuildAnchor(activity.summary_fields[activity.object2][0], activity.object2, activity) + if (activity.object1 === 'workflow_job_template_node' && activity.object2 === 'workflow_job_template_node') {
'from ' + activity.object1 + BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity); activity.description += 'two nodes on workflow' + BuildAnchor(activity.summary_fields[activity.object1[0]], activity.object1, activity);
} else {
activity.description += activity.object2 + BuildAnchor(activity.summary_fields[activity.object2][0], activity.object2, activity) +
'from ' + activity.object1 + BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity);
}
} }
break; break;
// expected outcome "associated <object2> to <object1>" // expected outcome "associated <object2> to <object1>"
@ -97,8 +101,12 @@ export default function BuildDescription(BuildAnchor, $log, i18n) {
'to ' + activity.object2 + BuildAnchor(activity.summary_fields.group[1], activity.object2, activity); 'to ' + activity.object2 + BuildAnchor(activity.summary_fields.group[1], activity.object2, activity);
} }
else { else {
activity.description += activity.object1 + BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity) + if (activity.object1 === 'workflow_job_template_node' && activity.object2 === 'workflow_job_template_node') {
'to ' + activity.object2 + BuildAnchor(activity.summary_fields[activity.object2][0], activity.object2, activity); activity.description += 'two nodes on workflow' + BuildAnchor(activity.summary_fields[activity.object1[0]], activity.object1, activity);
} else {
activity.description += activity.object1 + BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity) +
'to ' + activity.object2 + BuildAnchor(activity.summary_fields[activity.object2][0], activity.object2, activity);
}
} }
break; break;
case 'delete': case 'delete':