AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add users and categories filters on the board

This commit is contained in:
Frederic Guillot 2015-08-21 21:49:53 -04:00
parent 0057400d73
commit 7b664afd61
8 changed files with 88 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Controller/Board.php
View File

@ -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'),
@ -116,6 +118,29 @@ class Board extends Base
$this->response->html($this->renderBoard($project_id));
}
/**
* 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
*

2
app/Template/board/private_view.php
View File

@ -3,6 +3,8 @@
<?= $this->render('project/filters', array(
'project' => $project,
'filters' => $filters,
'categories_list' => $categories_list,
'users_list' => $users_list,
'is_board' => true,
)) ?>

1
app/Template/board/table_container.php
View File

@ -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'])) ?>"
>

26
app/Template/project/filters.php
View File

@ -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>

2
assets/js/app.js
View File

File diff suppressed because one or more lines are too long

3
assets/js/src/App.js
View File

@ -1,7 +1,8 @@
function App() {
this.board = new Board(this);
this.markdown = new Markdown();
this.sidebar = new Sidebar();
this.search = new Search();
this.search = new Search(this);
this.swimlane = new Swimlane();
this.dropdown = new Dropdown();
this.tooltip = new Tooltip(this);

17
assets/js/src/Board.js
View File

@ -25,6 +25,23 @@ Board.prototype.poll = function() {
}
};
Board.prototype.reloadFilters = function(search) {
this.app.showLoadingIcon();
$.ajax({
cache: false,
url: $("#board").data("reload-url"),
contentType: "application/json",
type: "POST",
processData: false,
data: JSON.stringify({
search: search
}),
success: this.refresh.bind(this),
error: this.app.hideLoadingIcon.bind(this)
});
};
Board.prototype.check = function() {
if (this.app.isVisible()) {

17
assets/js/src/Search.js
View File

@ -1,4 +1,5 @@
function Search() {
function Search(app) {
this.app = app;
this.keyboardShortcuts();
}
@ -12,11 +13,21 @@ Search.prototype.focus = function() {
};
Search.prototype.listen = function() {
var self = this;
// Filter helper for search
$(document).on("click", ".filter-helper", function (e) {
e.preventDefault();
$("#form-search").val($(this).data("filter"));
$("form.search").submit();
var filter = $(this).data("filter");
$("#form-search").val(filter);
if ($('#board').length) {
self.app.board.reloadFilters(filter);
}
else {
$("form.search").submit();
}
});
};