Started redesign of timesheets feature.

[timetracker.git] / timesheet_view.php

diff --git a/timesheet_view.php b/timesheet_view.php
index 5079fe7b7c1adaba1593b5e69707fa667ec629ba..e86b2df771e2efa1bd60e53bdba8be4f1ab67817 100644 (file)
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -30,7 +30,7 @@ require_once('initialize.php');
 import('ttTimesheetHelper');
 
 // Access checks.
 import('ttTimesheetHelper');
 
 // Access checks.

-if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets') || ttAccessAllowed('view_client_timesheets'))) {
+if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets'))) {

   header('Location: access_denied.php');
   exit();
 }
   header('Location: access_denied.php');
   exit();
 }


@@ -60,7 +60,7 @@ $notClient = !$user->isClient();
 // Determine which controls to show and obtain date for them.
 $showSubmit = $notClient && !$timesheet['submit_status'];
 if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
 // Determine which controls to show and obtain date for them.
 $showSubmit = $notClient && !$timesheet['submit_status'];
 if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);

-$canApprove = $user->can('approve_timesheets') || $user_>can('approve_all_timesheets');
+$canApprove = $user->can('approve_timesheets') || $user->can('approve_all_timesheets');

 $showApprove = $notClient && $timesheet['submit_status'] && $timesheet['approval_status'] == null;
 
 // Add a form with controls.
 $showApprove = $notClient && $timesheet['submit_status'] && $timesheet['approval_status'] == null;
 
 // Add a form with controls.