Skip to content

Commit 16ad712

Browse files
committed
Timesheet fixes
1 parent 5466e90 commit 16ad712

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/Domain/Timesheets/Templates/showAll.tpl.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
<td data-order="<?=$tpl->e($row['clientName']); ?>"><a href="<?=BASE_URL ?>/clients/showClient/<?php echo $row['clientId']; ?>"><?php $tpl->e($row['clientName']); ?></a></td>
244244

245245
<td><?php printf($tpl->__("text.full_name"), $tpl->escape($row["firstname"]), $tpl->escape($row['lastname'])); ?></td>
246-
<td><?php echo $tpl->__($tpl->get('kind')[$row['kind']]); ?></td>
246+
<td><?php echo $tpl->__($tpl->get('kind')[$row['kind'] ?? 'GENERAL_BILLABLE'] ?? $tpl->get('kind')['GENERAL_BILLABLE']); ?></td>
247247

248248
<td><?php echo $tpl->escape($row["milestone"]); ?></td>
249249
<td><?php echo $tpl->escape($row["tags"]); ?></td>

app/Domain/Timesheets/Templates/showMy.tpl.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
<a href="#/tickets/showTicket/<?php echo $timeRow['ticketId']; ?>"><?php $tpl->e($timeRow['headline']); ?></a>
294294
</td>
295295
<td width="10%">
296-
<?php echo $tpl->__($tpl->get('kind')[$timeRow['kind']]); ?>
296+
<?php echo $tpl->__($tpl->get('kind')[$row['kind'] ?? 'GENERAL_BILLABLE'] ?? $tpl->get('kind')['GENERAL_BILLABLE']); ?>
297297
<?php if ($timeRow['hasTimesheetOffset']) { ?>
298298
<i class="fa-solid fa-clock-rotate-left pull-right label-blue"
299299
data-tippy-content="This entry was likely created using a different timezone. Only existing entries can be updated in this timezone">

0 commit comments

Comments
 (0)