diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/Board.php | 25 | ||||
| -rw-r--r-- | app/Template/board/private_view.php | 2 | ||||
| -rw-r--r-- | app/Template/board/table_container.php | 1 | ||||
| -rw-r--r-- | app/Template/project/filters.php | 26 |
4 files changed, 54 insertions, 0 deletions
diff --git a/app/Controller/Board.php b/app/Controller/Board.php index 50d9c62e..976e44fc 100644 --- a/app/Controller/Board.php +++ b/app/Controller/Board.php @@ -50,6 +50,8 @@ class Board extends Base $params = $this->getProjectFilters('board', 'show'); $this->response->html($this->template->layout('board/private_view', array( + 'categories_list' => $this->category->getList($params['project']['id'], false), + 'users_list' => $this->projectPermission->getMemberList($params['project']['id'], false), 'swimlanes' => $this->taskFilter->search($params['filters']['search'])->getBoard($params['project']['id']), 'description' => $params['project']['description'], 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'), @@ -117,6 +119,29 @@ class Board extends Base } /** + * Reload the board with new filters + * + * @access public + */ + public function reload() + { + if (! $this->request->isAjax()) { + return $this->response->status(403); + } + + $project_id = $this->request->getIntegerParam('project_id'); + + if (! $this->projectPermission->isUserAllowed($project_id, $this->userSession->getId())) { + $this->response->text('Forbidden', 403); + } + + $values = $this->request->getJson(); + $this->userSession->setFilters($project_id, $values['search']); + + $this->response->html($this->renderBoard($project_id)); + } + + /** * Get links on mouseover * * @access public diff --git a/app/Template/board/private_view.php b/app/Template/board/private_view.php index 5fdaa7fc..d4c2c651 100644 --- a/app/Template/board/private_view.php +++ b/app/Template/board/private_view.php @@ -3,6 +3,8 @@ <?= $this->render('project/filters', array( 'project' => $project, 'filters' => $filters, + 'categories_list' => $categories_list, + 'users_list' => $users_list, 'is_board' => true, )) ?> diff --git a/app/Template/board/table_container.php b/app/Template/board/table_container.php index 65ccdc4f..98b40eb4 100644 --- a/app/Template/board/table_container.php +++ b/app/Template/board/table_container.php @@ -7,6 +7,7 @@ data-project-id="<?= $project['id'] ?>" data-check-interval="<?= $board_private_refresh_interval ?>" data-save-url="<?= $this->url->href('board', 'save', array('project_id' => $project['id'])) ?>" + data-reload-url="<?= $this->url->href('board', 'reload', array('project_id' => $project['id'])) ?>" data-check-url="<?= $this->url->href('board', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" data-task-creation-url="<?= $this->url->href('taskcreation', 'create', array('project_id' => $project['id'])) ?>" > diff --git a/app/Template/project/filters.php b/app/Template/project/filters.php index c16ba374..b53e160e 100644 --- a/app/Template/project/filters.php +++ b/app/Template/project/filters.php @@ -46,4 +46,30 @@ <?= $this->form->text('search', $filters, array(), array('placeholder="'.t('Filter').'"'), 'form-input-large') ?> </form> <?= $this->render('app/filters_helper', array('reset' => 'status:open')) ?> + + <?php if (isset($users_list)): ?> + <div class="dropdown filters"> + <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Users') ?></a> + <ul> + <li><a href="#" class="filter-helper" data-filter="status:open"><?= t('All users') ?></a></li> + <li><a href="#" class="filter-helper" data-filter="status:open assignee:nobody"><?= t('Not assigned') ?></a></li> + <?php foreach ($users_list as $user): ?> + <li><a href="#" class="filter-helper" data-filter='status:open assignee:"<?= $this->e($user) ?>"'><?= $this->e($user) ?></a></li> + <?php endforeach ?> + </ul> + </div> + <?php endif ?> + + <?php if (isset($categories_list) && ! empty($categories_list)): ?> + <div class="dropdown filters"> + <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Categories') ?></a> + <ul> + <li><a href="#" class="filter-helper" data-filter="status:open"><?= t('All categories') ?></a></li> + <li><a href="#" class="filter-helper" data-filter="status:open category:none"><?= t('No category') ?></a></li> + <?php foreach ($categories_list as $category): ?> + <li><a href="#" class="filter-helper" data-filter='status:open category:"<?= $this->e($category) ?>"'><?= $this->e($category) ?></a></li> + <?php endforeach ?> + </ul> + </div> + <?php endif ?> </div>
\ No newline at end of file |