From 3f7ed883e1c7d75aacc49900b403f8e84a68dc3f Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Tue, 13 Mar 2018 23:55:32 +0000 Subject: [PATCH] A few more replacements for canManageTeam. --- WEB-INF/lib/ttReportHelper.class.php | 18 +++++++++--------- WEB-INF/templates/footer.tpl | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index e58241e0..6ba55e36 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -58,11 +58,11 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) + if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users'))) $userlist = join(',', $bean->getAttribute('users')); // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; @@ -103,7 +103,7 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient())) { + if (($user->can('view_reports') || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { @@ -115,7 +115,7 @@ class ttReportHelper { } // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; @@ -152,11 +152,11 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) + if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users'))) $userlist = join(',', $bean->getAttribute('users')); // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; @@ -193,7 +193,7 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient())) { + if (($user->can('view_reports') || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { @@ -205,7 +205,7 @@ class ttReportHelper { } // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; @@ -239,7 +239,7 @@ class ttReportHelper { array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($user->can('view_reports') || $user->isClient()) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($bean->getAttribute('chclient') || 'client' == $group_by_option) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 304b4e27..9df34ecb 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,8 @@
-
 Anuko Time Tracker 1.17.43.4070 | Copyright © Anuko | +  Anuko Time Tracker 1.17.43.4071 + | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1