From: Nik Okuntseff Date: Sat, 14 Apr 2018 11:49:47 +0000 (+0000) Subject: Fixed getUser to include client_id. X-Git-Tag: timetracker_1.19-1~838 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4d16598799828cd01d430bf8cb78aeaf955af31e;p=timetracker.git Fixed getUser to include client_id. --- diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 0af49300..36d71363 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -353,7 +353,7 @@ class ttUser { $mdb2 = getConnection(); - $sql = "select u.id, u.name, u.login, u.role_id, u.status, u.rate, u.email from tt_users u". + $sql = "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u". " left join tt_roles r on (u.role_id = r.id)". " where u.id = $user_id and u.group_id = $this->group_id and u.status is not null". " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self. diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 93841759..e1e4c9b5 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.88.4262 | Copyright © Anuko | +  Anuko Time Tracker 1.17.88.4263 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve}