From 2d7329ba9ee02d996db189a87d79a02a877dd924 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Wed, 6 Mar 2019 19:43:34 +0000 Subject: [PATCH] Prohibiting editing approved records. --- WEB-INF/lib/ttTimeHelper.class.php | 2 +- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/mobile/time.tpl | 2 +- WEB-INF/templates/time.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index d2a35647..2a47c741 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -738,7 +738,7 @@ class ttTimeHelper { $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,". " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,". " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,". - " l.billable, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins". + " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins". " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1". " order by l.start, l.id"; $res = $mdb2->query($sql); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 9da5ebd9..ff57292b 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {/if} - + {/foreach}
 Anuko Time Tracker 1.18.53.4829 | Copyright © Anuko | +  Anuko Time Tracker 1.18.53.4830 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl index cde0b5ef..a342c764 100644 --- a/WEB-INF/templates/mobile/time.tpl +++ b/WEB-INF/templates/mobile/time.tpl @@ -25,7 +25,7 @@ {$record.project|escape}{if ($record.duration == '0:00' && $record.start <> '')}{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}{/if}{if $record.timesheet_id|| $record.invoice_id} {else}{$i18n.label.edit}{/if}{if $record.approved || $record.timesheet_id || $record.invoice_id} {else}{$i18n.label.edit}{/if}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index f82897d2..a181b912 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -130,7 +130,7 @@ {if ($record.duration == '0:00' && $record.start <> '')}{$i18n.form.time.uncompleted}{else}{$record.duration}{/if} {if $record.comment}{$record.comment|escape}{else} {/if} - {if $record.timesheet_id || $record.invoice_id} + {if $record.approved || $record.timesheet_id || $record.invoice_id}   {else} {$i18n.label.edit} -- 2.20.1