From: Nik Okuntseff <support@anuko.com>
Date: Fri, 1 Mar 2019 18:55:38 +0000 (+0000)
Subject: Added conditional display of show approvers.
X-Git-Tag: timetracker_1.19-1~243
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=88c67a664a63623a83ed241054525aa112f9c70c;p=timetracker.git

Added conditional display of show approvers.
---

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f81320ad..246dfca2 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.47.4802 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.47.4803 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
diff --git a/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index e6988253..bce187e7 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -53,7 +53,7 @@
   <tr>
     <td align="center">
       <table>
-        <tr><td>{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control} {$forms.timesheetForm.btn_submit.control}</td></tr>
+        <tr><td>  {if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control}</td></tr>
       </table>
     </td>
   </tr>
diff --git a/timesheet_view.php b/timesheet_view.php
index 9b5b4cdf..813edffb 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -58,7 +58,10 @@ $totals = ttReportHelper::getTotals($options);
 
 // Determine which controls to show and obtain date for them.
 $showSubmit = !$timesheet['submit_status'];
-if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+if ($showSubmit) {
+  $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+  $showApprovers = count($approvers) >= 1;
+}
 $canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
 $showApprove = $timesheet['submit_status'] && $timesheet['approval_status'] == null;
 
@@ -67,7 +70,7 @@ $form = new Form('timesheetForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$timesheet['id']));
 
 if ($showSubmit) {
-  if (count($approvers) >= 1) {
+  if ($showApprovers) {
     $form->addInput(array('type'=>'combobox',
       'name'=>'approver',
       'style'=>'width: 200px;',
@@ -124,6 +127,7 @@ $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 $smarty->assign('timesheet', $timesheet);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('show_approvers', $showApprovers);
 $smarty->assign('show_submit', $showSubmit);
 $smarty->assign('show_approve', $showApprove);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));