X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=dd4a81d5226ae31892b3783689569b6d3b287f58;hb=9c1005341a3db52333fcb732960acbdf03fbe4e7;hp=33a32dc2ae20148a52062481bf6459d8fa34805f;hpb=237f5fae68a9410971ce1c4895a07fe2fa0fbd52;p=timetracker.git diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 33a32dc2..dd4a81d5 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -424,7 +424,7 @@ class ttUser { $left_joins = null; if (isset($options['max_rank']) || $skipClients || isset($options['include_role'])) - $left_joins .= ' left join tt_roles r on (u.role_id = r.id)'; + $left_joins .= ' left join tt_roles r on (u.role_id = r.id)'; $where_part = " where u.org_id = $org_id and u.group_id = $group_id"; if (isset($options['status'])) @@ -482,21 +482,6 @@ class ttUser { // - The entire stack of groups all the way down to current on behalf group. // - All immediate children of the current on behalf group. // This allows user to navigate easily to home group, anything in between, and 1 level below. - // - // Note 1: group dropdown is, by design, to be placed on all pages where "relevant", - // such as users.php, projects.php, tasks.php, etc. But some features may be disabled - // in some groups. We should check for feature availability on group change - // in post and redirect to feature_disabled.php when this happens. - // This will allow us to keep dropdown content consistent on all pages. - // Filtering content of the dropdown does not seem right. - // - // Note 2: Menu should display according to $user home group settings. - // Pages, should look according to $user->behalfGroup settings (if set). - // For example, if home group allows tasks, menu should display Tasks, - // even when we are on behalf of a subgroup without tasks. - // - // Note 3: Language of all pages should be as in $user home group even when - // subgroups have a different language. function getGroupsForDropdown() { $mdb2 = getConnection();