More work in progress on report approval.

[timetracker.git] / timesheets.php

diff --git a/timesheets.php b/timesheets.php
index 0a926d9164619657fad02ac652be20f4efe1aff1..672e85974ad4673c0f6c2fa8e5f0c641eed49407 100644 (file)
--- a/timesheets.php
+++ b/timesheets.php
@@ -96,20 +96,19 @@ if ($user->can('view_timesheets') || $user->can('view_all_timesheets') || $user-
   }
 }
 
   }
 }
 

-
-
-
-// TODO: fix this for client access.

 $active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);
 $active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);

-$inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
-$show_client = $user->isPluginEnabled('cl') && $notClient;
+if ($notClient)
+  $inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
+
+$showClient = $user->isPluginEnabled('cl') && $notClient;
+$canEdit = $notClient && ($user->can('manage_own_timesheets') ||
+  $user->can('manage_timesheets') || $user->can('manage_all_timesheets'));

 
 $smarty->assign('active_timesheets', $active_timesheets);
 $smarty->assign('inactive_timesheets', $inactive_timesheets);
 
 $smarty->assign('active_timesheets', $active_timesheets);
 $smarty->assign('inactive_timesheets', $inactive_timesheets);

-$smarty->assign('show_client', $show_client);
-$smarty->assign('show_hint', $notClient);
-$smarty->assign('show_submit_status', $notClient);
-$smarty->assign('show_approval_status', $notClient);
+$smarty->assign('show_client', $showClient);
+$smarty->assign('not_client', $notClient);
+$smarty->assign('can_edit', $canEdit);

 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
 $smarty->assign('content_page_name', 'timesheets.tpl');
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.timesheets'));
 $smarty->assign('content_page_name', 'timesheets.tpl');