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

Fixes bug where workflow approvals page would crash if deleted username was referenced

Browse Source
This commit is contained in:
mabashian 2021-04-22 09:53:00 -04:00
parent 09801d0a9a
commit 31907423ce
8 changed files with 3780 additions and 3564 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1222
awx/ui_next/src/locales/en/messages.po
View File

File diff suppressed because it is too large Load Diff

1111
awx/ui_next/src/locales/es/messages.po
View File

File diff suppressed because it is too large Load Diff

965
awx/ui_next/src/locales/fr/messages.po
View File

File diff suppressed because it is too large Load Diff

965
awx/ui_next/src/locales/ja/messages.po
View File

File diff suppressed because it is too large Load Diff

1111
awx/ui_next/src/locales/nl/messages.po
View File

File diff suppressed because it is too large Load Diff

965
awx/ui_next/src/locales/zh/messages.po
View File

File diff suppressed because it is too large Load Diff

980
awx/ui_next/src/locales/zu/messages.po
View File

File diff suppressed because it is too large Load Diff

25
awx/ui_next/src/screens/WorkflowApproval/shared/WorkflowApprovalStatus.jsx
View File

@ -1,5 +1,4 @@
import React from 'react';
import { t } from '@lingui/macro';
import { Label, Tooltip } from '@patternfly/react-core';
import { CheckIcon, InfoCircleIcon } from '@patternfly/react-icons';
@ -24,9 +23,15 @@ function WorkflowApprovalStatus({ workflowApproval }) {
if (workflowApproval.status === 'failed' && workflowApproval.failed) {
return (
<Tooltip
content={t`Denied by ${
workflowApproval.summary_fields.approved_or_denied_by.username
} - ${formatDateString(workflowApproval.finished)}`}
content={
workflowApproval.summary_fields?.approved_or_denied_by?.username
? t`Denied by ${
workflowApproval.summary_fields.approved_or_denied_by.username
} - ${formatDateString(workflowApproval.finished)}`
: t`Denied - ${formatDateString(
workflowApproval.finished
)}. See the Activity Stream for more information.`
}
position="top"
>
<Label variant="outline" color="red" icon={<InfoCircleIcon />}>
@ -39,9 +44,15 @@ function WorkflowApprovalStatus({ workflowApproval }) {
if (workflowApproval.status === 'successful') {
return (
<Tooltip
content={t`Approved by ${
workflowApproval.summary_fields.approved_or_denied_by.username
} - ${formatDateString(workflowApproval.finished)}`}
content={
workflowApproval.summary_fields?.approved_or_denied_by?.username
? t`Approved by ${
workflowApproval.summary_fields.approved_or_denied_by.username
} - ${formatDateString(workflowApproval.finished)}`
: t`Approved - ${formatDateString(
workflowApproval.finished
)}. See the Activity Stream for more information.`
}
position="top"
>
<Label variant="outline" color="green" icon={<CheckIcon />}>