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

Unification of project header

Browse Source
This commit is contained in:
Frederic Guillot
2016-03-25 17:41:41 -04:00
parent 13d5bd8e48
commit 354e37971d
37 changed files with 194 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/Gantt.php
View File

@@ -54,8 +54,9 @@ class Gantt extends Base
*/
public function project()
{
$params = $this->getProjectFilters('gantt', 'project');
$filter = $this->taskFilterGanttFormatter->search($params['filters']['search'])->filterByProject($params['project']['id']);
$project = $this->getProject();
$search = $this->helper->projectHeader->getSearchQuery($project);
$filter = $this->taskFilterGanttFormatter->search($search)->filterByProject($project['id']);
$sorting = $this->request->getStringParam('sorting', 'board');
if ($sorting === 'date') {
@@ -64,8 +65,10 @@ class Gantt extends Base
$filter->getQuery()->asc('column_position')->asc(TaskModel::TABLE.'.position');
}
$this->response->html($this->helper->layout->app('gantt/project', $params + array(
'users_list' => $this->projectUserRole->getAssignableUsersList($params['project']['id'], false),
$this->response->html($this->helper->layout->app('gantt/project', array(
'project' => $project,
'title' => $project['name'],
'description' => $this->helper->projectHeader->getDescription($project),
'sorting' => $sorting,
'tasks' => $filter->format(),
)));