diff options
| author | Busfreak <Busfreak@users.noreply.github.com> | 2015-12-23 00:18:32 +0100 |
|---|---|---|
| committer | Busfreak <Busfreak@users.noreply.github.com> | 2015-12-23 00:18:32 +0100 |
| commit | 050d69091822641dabd0ded1b6023b7ef9f90311 (patch) | |
| tree | 7a6698152aafc9f1eece503f5fa4d4a772782fcd /app/Controller/User.php | |
| parent | be2fde7cc01228ad4526e05d77a3d4865e550357 (diff) | |
| parent | 8ff2032ea3fa49972fe076166c831719131e829d (diff) | |
Merge pull request #1 from fguillot/master
please merge
Diffstat (limited to 'app/Controller/User.php')
| -rw-r--r-- | app/Controller/User.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/Controller/User.php b/app/Controller/User.php index 0968d5a5..8b6df44c 100644 --- a/app/Controller/User.php +++ b/app/Controller/User.php @@ -26,7 +26,7 @@ class User extends Base { $content = $this->template->render($template, $params); $params['user_content_for_layout'] = $content; - $params['board_selector'] = $this->projectUserRole->getProjectsByUser($this->userSession->getId()); + $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()); if (isset($params['user'])) { $params['title'] = ($params['user']['name'] ?: $params['user']['username']).' (#'.$params['user']['id'].')'; @@ -51,7 +51,7 @@ class User extends Base $this->response->html( $this->template->layout('user/index', array( - 'board_selector' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), + 'board_selector' => $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()), 'title' => t('Users').' ('.$paginator->getTotal().')', 'paginator' => $paginator, ))); @@ -72,7 +72,7 @@ class User extends Base $this->response->html( $this->template->layout('user/profile', array( - 'board_selector' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), + 'board_selector' => $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()), 'title' => $user['name'] ?: $user['username'], 'user' => $user, ) @@ -92,7 +92,7 @@ class User extends Base 'timezones' => $this->config->getTimezones(true), 'languages' => $this->config->getLanguages(true), 'roles' => $this->role->getApplicationRoles(), - 'board_selector' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), + 'board_selector' => $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()), 'projects' => $this->project->getList(), 'errors' => $errors, 'values' => $values + array('role' => Role::APP_USER), |