diff options
| author | mkysoft <mkysoft@gmail.com> | 2019-09-05 00:33:36 +0300 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2019-09-04 20:27:24 -0700 |
| commit | 93dee80c04a4be2250680473313ec4bc7682ee55 (patch) | |
| tree | 1ee27cb85f693cf4c40f7e813ed29ead4682ac45 | |
| parent | cb2414c99af52e60f4fda7cf809d937d1d6010b2 (diff) | |
Anybody added for filter
| -rw-r--r-- | app/Filter/TaskAssigneeFilter.php | 3 | ||||
| -rw-r--r-- | app/Filter/TaskCreatorFilter.php | 3 | ||||
| -rw-r--r-- | app/Filter/TaskSubtaskAssigneeFilter.php | 3 | ||||
| -rw-r--r-- | app/Locale/tr_TR/translations.php | 1 | ||||
| -rw-r--r-- | app/Template/app/filters_helper.php | 1 | ||||
| -rw-r--r-- | app/Template/project_header/search.php | 1 |
6 files changed, 12 insertions, 0 deletions
diff --git a/app/Filter/TaskAssigneeFilter.php b/app/Filter/TaskAssigneeFilter.php index d6962a93..d0e8a9fa 100644 --- a/app/Filter/TaskAssigneeFilter.php +++ b/app/Filter/TaskAssigneeFilter.php @@ -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.'%'); diff --git a/app/Filter/TaskCreatorFilter.php b/app/Filter/TaskCreatorFilter.php index 611db189..39bb8ff7 100644 --- a/app/Filter/TaskCreatorFilter.php +++ b/app/Filter/TaskCreatorFilter.php @@ -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.'%'); diff --git a/app/Filter/TaskSubtaskAssigneeFilter.php b/app/Filter/TaskSubtaskAssigneeFilter.php index 1096bf64..4c5e0f7b 100644 --- a/app/Filter/TaskSubtaskAssigneeFilter.php +++ b/app/Filter/TaskSubtaskAssigneeFilter.php @@ -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.'%'); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index 7dfb4308..da7a6049 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -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ü', diff --git a/app/Template/app/filters_helper.php b/app/Template/app/filters_helper.php index c16c2251..5515823d 100644 --- a/app/Template/app/filters_helper.php +++ b/app/Template/app/filters_helper.php @@ -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') ?> diff --git a/app/Template/project_header/search.php b/app/Template/project_header/search.php index d523c084..40df86d0 100644 --- a/app/Template/project_header/search.php +++ b/app/Template/project_header/search.php @@ -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 ?> |