From b14cf15f563feabc7015e3af99ea8cb7a1903dc1 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sat, 23 Feb 2019 22:21:48 +0000 Subject: [PATCH 1/1] Fixed ttTimesheetHelper::getApprovers function. --- WEB-INF/lib/ttTimesheetHelper.class.php | 2 +- WEB-INF/templates/footer.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php index 21e75a96..05832657 100644 --- a/WEB-INF/lib/ttTimesheetHelper.class.php +++ b/WEB-INF/lib/ttTimesheetHelper.class.php @@ -336,7 +336,7 @@ class ttTimesheetHelper { $sql = "select u.id, u.name, u.email". " from tt_users u". " left join tt_roles r on (r.id = u.role_id)". - " where u.status = 1 and u.email is not null". + " where u.status = 1 and u.email is not null and u.group_id = $group_id and u.org_id = $org_id". " and (r.rights like '%approve_all_timesheets%' or (r.rank > $rank and r.rights like '%approve_timesheets%'))"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index a0366229..63d61ef9 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.41.4764 | Copyright © Anuko | +  Anuko Time Tracker 1.18.41.4765 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1