admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2024-08-30 (pull request #1679)

Browse Source 
IO-2894 Null check
This commit is contained in:
Allan Carr
2024-09-03 16:01:19 +00:00
parent 5f513a8bef f1e84c348b
commit 718c8291a8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/time-ticket-list/time-ticket-list.component.jsx
View File

@@ -165,7 +165,7 @@ export function TimeTicketList({
key: "memo", key: "memo",
sorter: (a, b) => alphaSort(a.memo, b.memo), sorter: (a, b) => alphaSort(a.memo, b.memo),
sortOrder: state.sortedInfo.columnKey === "memo" && state.sortedInfo.order, sortOrder: state.sortedInfo.columnKey === "memo" && state.sortedInfo.order,
render: (text, record) => (record.memo.startsWith("timetickets.labels") ? t(record.memo) : record.memo) render: (text, record) => (record.memo?.startsWith("timetickets.labels") ? t(record.memo) : record.memo)
}, },
...(Enhanced_Payroll.treatment === "on" ...(Enhanced_Payroll.treatment === "on"
? [ ? [

2
client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx
View File

@@ -39,7 +39,7 @@ export default function TimeTicketShiftActive({ timetickets, refetch, isTechCons
renderItem={(ticket) => ( renderItem={(ticket) => (
<List.Item> <List.Item>
<Card <Card
title={ticket.memo.startsWith("timetickets.labels") ? t(ticket.memo) : ticket.memo} title={ticket.memo?.startsWith("timetickets.labels") ? t(ticket.memo) : ticket.memo}
actions={[ actions={[
<TechClockOffButton <TechClockOffButton
jobId={ticket.jobid} jobId={ticket.jobid}