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

Anybody added for filter

This commit is contained in:
mkysoft 2019-09-05 00:33:36 +03:00 committed by Frédéric Guillot
parent cb2414c99a
commit 93dee80c04
6 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Filter/TaskAssigneeFilter.php
View File

@ -64,6 +64,9 @@ class TaskAssigneeFilter extends BaseFilter implements FilterInterface
case 'nobody':
$this->query->eq(TaskModel::TABLE.'.owner_id', 0);
break;
case 'anybody':
$this->query->gt(TaskModel::TABLE.'.owner_id', 0);
break;
default:
$this->query->beginOr();
$this->query->ilike(UserModel::TABLE.'.username', '%'.$this->value.'%');

3
app/Filter/TaskCreatorFilter.php
View File

@ -63,6 +63,9 @@ class TaskCreatorFilter extends BaseFilter implements FilterInterface
case 'nobody':
$this->query->eq(TaskModel::TABLE.'.creator_id', 0);
break;
case 'anybody':
$this->query->gt(TaskModel::TABLE.'.creator_id', 0);
break;
default:
$this->query->beginOr();
$this->query->ilike('uc.username', '%'.$this->value.'%');

3
app/Filter/TaskSubtaskAssigneeFilter.php
View File

@ -116,6 +116,9 @@ class TaskSubtaskAssigneeFilter extends BaseFilter implements FilterInterface
case 'nobody':
$subquery->eq(SubtaskModel::TABLE.'.user_id', 0);
break;
case 'anybody':
$subquery->gt(SubtaskModel::TABLE.'.user_id', 0);
break;
default:
$subquery->beginOr();
$subquery->ilike(UserModel::TABLE.'.username', $this->value.'%');

1
app/Locale/tr_TR/translations.php
View File

@ -662,6 +662,7 @@ return array(
'Closed tasks' => 'Kapatılmış görevler',
'Open tasks' => 'Açık görevler',
'Not assigned' => 'Atanmamış',
'Assigned' => 'Atanmış',
'View advanced search syntax' => 'Gelişmiş arama kodlarını göster',
'Overview' => 'Özet Görünüm',
'Board/Calendar/List view' => 'Pano/Takvim/Liste görünümü',

1
app/Template/app/filters_helper.php
View File

@ -11,6 +11,7 @@
<li><a href="#" class="filter-helper" data-filter="status:closed"><?= t('Closed tasks') ?></a></li>
<li><a href="#" class="filter-helper" data-filter="status:open"><?= t('Open tasks') ?></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-filter="status:open assignee:anybody"><?= t('Assigned') ?></a></li>
<li><a href="#" class="filter-helper" data-filter="status:open category:none"><?= t('No category') ?></a></li>
<li>
<?= $this->url->doc(t('View advanced search syntax'), 'search') ?>

1
app/Template/project_header/search.php
View File

@ -30,6 +30,7 @@
<a href="#" class="dropdown-menu dropdown-menu-link-icon" title="<?= t('User filters') ?>"><i class="fa fa-users fa-fw"></i> <i class="fa fa-caret-down"></i></a>
<ul>
<li><a href="#" class="filter-helper" data-unique-filter="assignee:nobody"><?= t('Not assigned') ?></a></li>
<li><a href="#" class="filter-helper" data-unique-filter="assignee:anybody"><?= t('Assigned') ?></a></li>
<?php foreach ($users_list as $user): ?>
<li><a href="#" class="filter-helper" data-unique-filter='assignee:"<?= $this->text->e($user) ?>"'><?= $this->text->e($user) ?></a></li>
<?php endforeach ?>