projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved users page a bit in accordance with user rights.
[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
3461ac5
..
5321e74
100644
(file)
--- a/
WEB-INF/lib/ttUser.class.php
+++ b/
WEB-INF/lib/ttUser.class.php
@@
-251,12
+251,14
@@
class ttUser {
$includeSelf = isset($options['include_self']);
$select_part = 'select u.id, u.name';
$includeSelf = isset($options['include_self']);
$select_part = 'select u.id, u.name';
+ if (isset($options['include_login'])) $select_part .= ', u.login';
if (!isset($options['include_clients'])) $select_part .= ', r.rights';
if (!isset($options['include_clients'])) $select_part .= ', r.rights';
+ if (isset($options['include_role'])) $select_part .= ', r.name as role_name, r.rank';
$from_part = ' from tt_users u';
$left_joins = null;
$from_part = ' from tt_users u';
$left_joins = null;
- if (isset($options['max_rank']) || $skipClients)
+ if (isset($options['max_rank']) || $skipClients
|| isset($options['include_role'])
)
$left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
$where_part = " where u.team_id = $this->team_id";
$left_joins .= ' left join tt_roles r on (u.role_id = r.id)';
$where_part = " where u.team_id = $this->team_id";