From bb9e7916574bd7e21550bf7505757fccae6cbdd0 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 11 Mar 2017 18:08:25 -0500 Subject: Use same layout as task listing for task search --- ChangeLog | 1 + app/Controller/SearchController.php | 4 +- app/Template/search/activity.php | 75 ++++++++++++++++----------------- app/Template/search/index.php | 81 +++++++++++++++++------------------- app/Template/search/results.php | 83 +++++++++++++------------------------ app/Template/task_list/header.php | 10 +++-- 6 files changed, 112 insertions(+), 142 deletions(-) diff --git a/ChangeLog b/ChangeLog index 656fa32a..26f6a0d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Improvements: * Render QR code for TwoFactor authentication without Google Chart API * Add toggle button to show/hide subtasks in task list view +* Use same layout as task listing for task search * Display tags in task list view * Make user actions available from contextual menu * Change users and groups list layout diff --git a/app/Controller/SearchController.php b/app/Controller/SearchController.php index c9213085..e909a99c 100644 --- a/app/Controller/SearchController.php +++ b/app/Controller/SearchController.php @@ -3,6 +3,7 @@ namespace Kanboard\Controller; use Kanboard\Filter\TaskProjectsFilter; +use Kanboard\Model\TaskModel; /** * Search Controller @@ -21,11 +22,12 @@ class SearchController extends BaseController $paginator = $this->paginator ->setUrl('SearchController', 'index', array('search' => $search)) ->setMax(30) - ->setOrder('tasks.id') + ->setOrder(TaskModel::TABLE.'.id') ->setDirection('DESC'); if ($search !== '' && ! empty($projects)) { $paginator + ->setFormatter($this->taskListFormatter) ->setQuery($this->taskLexer ->build($search) ->withFilter(new TaskProjectsFilter(array_keys($projects))) diff --git a/app/Template/search/activity.php b/app/Template/search/activity.php index 6be346b6..c48cce22 100644 --- a/app/Template/search/activity.php +++ b/app/Template/search/activity.php @@ -1,45 +1,40 @@ -
-
-
    -
  • - url->icon('search', t('Search tasks'), 'SearchController', 'index') ?> -
    • -
-
+
+
    +
  • + url->icon('search', t('Search tasks'), 'SearchController', 'index') ?> +
    • +
+
-
-
- form->hidden('controller', $values) ?> - form->hidden('action', $values) ?> +
+ + form->hidden('controller', $values) ?> + form->hidden('action', $values) ?> -
- form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'input-addon-field') ?> -
- render('app/filters_helper') ?> -
+
+ form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'input-addon-field') ?> +
+ render('app/filters_helper') ?>
- -
- - -
-

-

project:"My project" creator:me

-
    -
  • project:"My project"
    • -
  • creator:admin
    • -
  • created:today
    • -
  • status:open
    • -
  • title:"My task"
    • -
-

url->doc(t('View advanced search syntax'), 'search') ?>

- -

- -
- render('event/events', array('events' => $events)) ?> -
- + +
-
+ +
+

+

project:"My project" creator:me

+ +

url->doc(t('View advanced search syntax'), 'search') ?>

+
+ +

+ + render('event/events', array('events' => $events)) ?> + diff --git a/app/Template/search/index.php b/app/Template/search/index.php index 9a5f2931..16bbac0f 100644 --- a/app/Template/search/index.php +++ b/app/Template/search/index.php @@ -1,47 +1,44 @@ -
-
-
    -
  • - url->icon('search', t('Activity stream search'), 'SearchController', 'activity') ?> -
    • -
-
+
+
    +
  • + url->icon('search', t('Activity stream search'), 'SearchController', 'activity') ?> +
    • +
+
-
-
- form->hidden('controller', $values) ?> - form->hidden('action', $values) ?> +
+ + form->hidden('controller', $values) ?> + form->hidden('action', $values) ?> -
- form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'input-addon-field') ?> -
- render('app/filters_helper') ?> -
+
+ form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'input-addon-field') ?> +
+ render('app/filters_helper') ?>
- -
- - -
-

-

project:"My project" assignee:me due:tomorrow

-
    -
  • project:"My project"
    • -
  • column:"Work in progress"
    • -
  • assignee:nobody
    • -
  • color:Blue
    • -
  • category:"Feature Request"
    • -
  • description:"Something to find"
    • -
  • due:2015-07-01
    • -
-

url->doc(t('View advanced search syntax'), 'search') ?>

- isEmpty()): ?> -

- isEmpty()): ?> - render('search/results', array( - 'paginator' => $paginator, - )) ?> - + +
-
+ +
+

+

project:"My project" assignee:me due:tomorrow

+ +

url->doc(t('View advanced search syntax'), 'search') ?>

+
+isEmpty()): ?> +

+isEmpty()): ?> + render('search/results', array( + 'paginator' => $paginator, + )) ?> + diff --git a/app/Template/search/results.php b/app/Template/search/results.php index f4d6d1db..f5a4cfc8 100644 --- a/app/Template/search/results.php +++ b/app/Template/search/results.php @@ -1,58 +1,31 @@ - - - - - - - - - - - - +
+ render('task_list/header', array( + 'paginator' => $paginator, + )) ?> + getCollection() as $task): ?> -
- - - - - - - - - - +
+ render('task_list/task_title', array( + 'task' => $task, + )) ?> + + render('task_list/task_details', array( + 'task' => $task, + )) ?> + + render('task_list/task_avatars', array( + 'task' => $task, + )) ?> + + render('task_list/task_icons', array( + 'task' => $task, + )) ?> + + render('task_list/task_subtasks', array( + 'task' => $task, + )) ?> +
-
order(t('Id'), 'tasks.id') ?>order(t('Project'), 'tasks.project_id') ?>order(t('Swimlane'), 'tasks.swimlane_id') ?>order(t('Column'), 'tasks.column_id') ?>order(t('Category'), 'tasks.category_id') ?>order(t('Title'), 'tasks.title') ?>order(t('Assignee'), 'users.username') ?>order(t('Due date'), 'tasks.date_due') ?>order(t('Status'), 'tasks.is_active') ?>
- user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> - render('task/dropdown', array('task' => $task)) ?> - - # - - - url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?> - - text->e($task['swimlane_name']) ?> - - text->e($task['column_name']) ?> - - text->e($task['category_name']) ?> - - url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - - - text->e($task['assignee_name'] ?: $task['assignee_username']) ?> - - - - - dt->date($task['date_due']) ?> - - - - - - -
+ - + \ No newline at end of file diff --git a/app/Template/task_list/header.php b/app/Template/task_list/header.php index 6501a919..7704e2df 100644 --- a/app/Template/task_list/header.php +++ b/app/Template/task_list/header.php @@ -7,10 +7,12 @@
- user->hasSubtaskListActivated()): ?> - url->icon('tasks', t('Hide subtasks'), 'TaskListController', 'show', array('project_id' => $project['id'], 'hide_subtasks' => 1)) ?> - - url->icon('tasks', t('Show subtasks'), 'TaskListController', 'show', array('project_id' => $project['id'], 'show_subtasks' => 1)) ?> + + user->hasSubtaskListActivated()): ?> + url->icon('tasks', t('Hide subtasks'), 'TaskListController', 'show', array('project_id' => $project['id'], 'hide_subtasks' => 1)) ?> + + url->icon('tasks', t('Show subtasks'), 'TaskListController', 'show', array('project_id' => $project['id'], 'show_subtasks' => 1)) ?> + render('task_list/sort_menu', array('paginator' => $paginator)) ?> -- cgit v1.2.3