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/Group.php | |
| parent | be2fde7cc01228ad4526e05d77a3d4865e550357 (diff) | |
| parent | 8ff2032ea3fa49972fe076166c831719131e829d (diff) | |
Merge pull request #1 from fguillot/master
please merge
Diffstat (limited to 'app/Controller/Group.php')
| -rw-r--r-- | app/Controller/Group.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/Controller/Group.php b/app/Controller/Group.php index 3e6505e9..3c9c4a07 100644 --- a/app/Controller/Group.php +++ b/app/Controller/Group.php @@ -25,7 +25,7 @@ class Group extends Base ->calculate(); $this->response->html($this->template->layout('group/index', array( - 'board_selector' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), + 'board_selector' => $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()), 'title' => t('Groups').' ('.$paginator->getTotal().')', 'paginator' => $paginator, ))); @@ -49,7 +49,7 @@ class Group extends Base ->calculate(); $this->response->html($this->template->layout('group/users', array( - 'board_selector' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), + 'board_selector' => $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()), 'title' => t('Members of %s', $group['name']).' ('.$paginator->getTotal().')', 'paginator' => $paginator, 'group' => $group, @@ -64,7 +64,7 @@ class Group extends Base public function create(array $values = array(), array $errors = array()) { $this->response->html($this->template->layout('group/create', array( - 'board_selector' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), + 'board_selector' => $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()), 'errors' => $errors, 'values' => $values, 'title' => t('New group') @@ -105,7 +105,7 @@ class Group extends Base } $this->response->html($this->template->layout('group/edit', array( - 'board_selector' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), + 'board_selector' => $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()), 'errors' => $errors, 'values' => $values, 'title' => t('Edit group') @@ -149,7 +149,7 @@ class Group extends Base } $this->response->html($this->template->layout('group/associate', array( - 'board_selector' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), + 'board_selector' => $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()), 'users' => $this->user->prepareList($this->groupMember->getNotMembers($group_id)), 'group' => $group, 'errors' => $errors, |