Added conditional display of show approvers.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f81320ad686773cf7e050411b700077ad8a5bdaa..246dfca299993aabf0d794839e80d708fb4a0406 100644 (file)
--- 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>
       <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>
             <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 e69882530cccd9109b819dffc889759c4c380038..bce187e7463b1f3f6d6f5352df397e66fe473702 100644 (file)
--- 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 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>
       </table>
     </td>
   </tr>

diff --git a/timesheet_view.php b/timesheet_view.php
index 9b5b4cdfed935aa893dd62cb6e16a9847181f76c..813edffb873a0c1634843c0b2673cd64989f8002 100644 (file)
--- 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'];
 
 // 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;
 
 $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) {
 $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;',
     $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('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()));
 $smarty->assign('show_submit', $showSubmit);
 $smarty->assign('show_approve', $showApprove);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));