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

change up a few activity stream and approval drawer issues

Browse Source
This commit is contained in:
Ryan Petrello
2019-08-15 15:52:29 -04:00
parent aac8c9fb04
commit dd89e46ee6
6 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/lib/components/approvalsDrawer/approvalsDrawer.partial.html
View File

@@ -30,11 +30,19 @@
<div class="at-Row-container">
<at-row-item
header-value="{{ approval.summary_fields.source_workflow_job.name }}"
header-state="workflowResults({id: {{approval.summary_fields.source_workflow_job.id}}})"
header-state="workflowResults({pid: {{approval.summary_fields.source_workflow_job.id}}})"
header-tag="{{:: vm.strings.get('approvals.WORKFLOW_TEMPLATE') }}">
</at-row-item>
</div>
</div>
<div class="at-Row-container--wrapped">
<at-row-item
value-bind-html="<b>Pause Node</b>">
</at-row-item>
<at-row-item
value-bind-html="{{ approval.name }}">
</at-row-item>
</div>
<div class="at-Row-container--wrapped">
<at-row-item
value-bind-html="{{ approval.created | longDate }}">
@@ -78,4 +86,4 @@
hide-view-per-page="true">
</paginate>
</div>
</div>
</div>

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

@@ -95,7 +95,7 @@ export default function BuildAnchor($log, $filter) {
break;
case 'workflow_approval':
url += `workflows/${activity.summary_fields.workflow_job[0].id}`;
name = activity.summary_fields.workflow_job[0].name;
name = activity.summary_fields.workflow_job[0].name + ' | ' + activity.summary_fields.workflow_approval[0].name;
break;
default:
url += resource + 's/' + obj.id + '/';

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

@@ -132,7 +132,13 @@ export default function BuildDescription(BuildAnchor, $log, i18n) {
if (activity.changes.status[1] === 'successful') {
operationText = i18n._('approved');
} else if (activity.changes.status[1] === 'failed') {
operationText = i18n._('denied');
if (activity.changes.timed_out && activity.changes.timed_out[1] === true) {
operationText = i18n._('timed out');
} else {
operationText = i18n._('denied');
}
} else {
operationText = i18n._('updated');
}
activity.description = `${operationText} ${activity.object1} ${BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity)}`;
} else {