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

Fix pagination on task time tracking page

Browse Source
This commit is contained in:
Frederic Guillot
2016-02-05 19:19:39 -05:00
parent ae150d80c2
commit 9840fa8e07
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -36,6 +36,10 @@ Improvements:
* Simplify layout and templates generation * Simplify layout and templates generation
* Move task form elements to Task helper * Move task form elements to Task helper
Bug fixes:
* Fix pagination on task time tracking page
Version 1.0.24 Version 1.0.24
-------------- --------------

2
app/Controller/Task.php
View File

@@ -114,7 +114,7 @@ class Task extends Base
$task = $this->getTask(); $task = $this->getTask();
$subtask_paginator = $this->paginator $subtask_paginator = $this->paginator
->setUrl('task', 'timesheet', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'pagination' => 'subtasks')) ->setUrl('task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'pagination' => 'subtasks'))
->setMax(15) ->setMax(15)
->setOrder('start') ->setOrder('start')
->setDirection('DESC') ->setDirection('DESC')

1
app/ServiceProvider/RouteProvider.php
View File

@@ -97,6 +97,7 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('project/:project_id/task/:task_id/upload', 'file', 'create'); $container['route']->addRoute('project/:project_id/task/:task_id/upload', 'file', 'create');
$container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'task', 'transitions'); $container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'task', 'transitions');
$container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'task', 'analytics'); $container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'task', 'analytics');
$container['route']->addRoute('project/:project_id/task/:task_id/time-tracking', 'task', 'timetracking');
$container['route']->addRoute('project/:project_id/task/:task_id/internal/links', 'tasklink', 'show'); $container['route']->addRoute('project/:project_id/task/:task_id/internal/links', 'tasklink', 'show');
$container['route']->addRoute('project/:project_id/task/:task_id/external/links', 'TaskExternalLink', 'show'); $container['route']->addRoute('project/:project_id/task/:task_id/external/links', 'TaskExternalLink', 'show');

2
app/Template/task/time_tracking_details.php
View File

@@ -10,7 +10,7 @@
<th><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th> <th><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th>
<th class="column-20"><?= $subtask_paginator->order(t('Start'), 'start') ?></th> <th class="column-20"><?= $subtask_paginator->order(t('Start'), 'start') ?></th>
<th class="column-20"><?= $subtask_paginator->order(t('End'), 'end') ?></th> <th class="column-20"><?= $subtask_paginator->order(t('End'), 'end') ?></th>
<th class="column-10"><?= $subtask_paginator->order(t('Time spent'), 'time_spent') ?></th> <th class="column-10"><?= $subtask_paginator->order(t('Time spent'), \Kanboard\Model\SubtaskTimeTracking::TABLE.'.time_spent') ?></th>
</tr> </tr>
<?php foreach ($subtask_paginator->getCollection() as $record): ?> <?php foreach ($subtask_paginator->getCollection() as $record): ?>
<tr> <tr>