From f3deb6492a74f1ffa9e3391274e0ab7947a04016 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 26 Feb 2017 19:30:02 -0500 Subject: Add toggle button to show/hide subtasks in task list view --- app/Controller/TaskListController.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'app/Controller/TaskListController.php') diff --git a/app/Controller/TaskListController.php b/app/Controller/TaskListController.php index b3709a18..f2f2f6e5 100644 --- a/app/Controller/TaskListController.php +++ b/app/Controller/TaskListController.php @@ -23,12 +23,24 @@ class TaskListController extends BaseController $project = $this->getProject(); $search = $this->helper->projectHeader->getSearchQuery($project); + if ($this->request->getIntegerParam('show_subtasks')) { + $this->sessionStorage->subtaskListToggle = true; + } elseif ($this->request->getIntegerParam('hide_subtasks')) { + $this->sessionStorage->subtaskListToggle = false; + } + + if ($this->userSession->hasSubtaskListActivated()) { + $formatter = $this->taskListSubtaskFormatter; + } else { + $formatter = $this->taskListFormatter; + } + $paginator = $this->paginator ->setUrl('TaskListController', 'show', array('project_id' => $project['id'])) ->setMax(30) ->setOrder(TaskModel::TABLE.'.id') ->setDirection('DESC') - ->setFormatter($this->taskListFormatter) + ->setFormatter($formatter) ->setQuery($this->taskLexer ->build($search) ->withFilter(new TaskProjectFilter($project['id'])) -- cgit v1.2.3