diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-09-26 21:48:48 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-09-26 21:48:48 -0400 |
| commit | 58c74b80d2c9b8d51df91a7287a22e5d3f99391c (patch) | |
| tree | 1fb8207a79abc4dd31a24ea255a655751cadabdb /app | |
| parent | 66514aa530cfb3b84f01e5eb578d35b4178e651e (diff) | |
Append filters instead of replacing value for users and categories dropdowns
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/Board.php | 2 | ||||
| -rw-r--r-- | app/Template/project/filters.php | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app/Controller/Board.php b/app/Controller/Board.php index 0de6f297..5851bd26 100644 --- a/app/Controller/Board.php +++ b/app/Controller/Board.php @@ -136,7 +136,7 @@ class Board extends Base } $values = $this->request->getJson(); - $this->userSession->setFilters($project_id, $values['search']); + $this->userSession->setFilters($project_id, empty($values['search']) ? '' : $values['search']); $this->response->html($this->renderBoard($project_id)); } diff --git a/app/Template/project/filters.php b/app/Template/project/filters.php index 41663b8a..5b9ac472 100644 --- a/app/Template/project/filters.php +++ b/app/Template/project/filters.php @@ -67,10 +67,9 @@ <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> + <li><a href="#" class="filter-helper" data-append-filter="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> + <li><a href="#" class="filter-helper" data-append-filter='assignee:"<?= $this->e($user) ?>"'><?= $this->e($user) ?></a></li> <?php endforeach ?> </ul> </div> @@ -80,10 +79,9 @@ <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> + <li><a href="#" class="filter-helper" data-append-filter="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> + <li><a href="#" class="filter-helper" data-append-filter='category:"<?= $this->e($category) ?>"'><?= $this->e($category) ?></a></li> <?php endforeach ?> </ul> </div> |