projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more refactoring.
[timetracker.git]
/
WEB-INF
/
lib
/
ttUser.class.php
diff --git
a/WEB-INF/lib/ttUser.class.php
b/WEB-INF/lib/ttUser.class.php
index
0af4930
..
36d7136
100644
(file)
--- a/
WEB-INF/lib/ttUser.class.php
+++ b/
WEB-INF/lib/ttUser.class.php
@@
-353,7
+353,7
@@
class ttUser {
$mdb2 = getConnection();
$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.
" 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.