From 9840fa8e07a609245c0db0c56c77cb83491b5acc Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 5 Feb 2016 19:19:39 -0500
Subject: Fix pagination on task time tracking page

---
 ChangeLog                                   | 4 ++++
 app/Controller/Task.php                     | 2 +-
 app/ServiceProvider/RouteProvider.php       | 1 +
 app/Template/task/time_tracking_details.php | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce8fb336..41b56012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,10 @@ Improvements:
 * Simplify layout and templates generation
 * Move task form elements to Task helper
 
+Bug fixes:
+
+* Fix pagination on task time tracking page
+
 Version 1.0.24
 --------------
 
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 0d463725..40ff8448 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -114,7 +114,7 @@ class Task extends Base
         $task = $this->getTask();
 
         $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)
             ->setOrder('start')
             ->setDirection('DESC')
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index b49be100..4a848669 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -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/transitions', 'task', 'transitions');
             $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/external/links', 'TaskExternalLink', 'show');
 
diff --git a/app/Template/task/time_tracking_details.php b/app/Template/task/time_tracking_details.php
index faa07cb8..85ad5567 100644
--- a/app/Template/task/time_tracking_details.php
+++ b/app/Template/task/time_tracking_details.php
@@ -10,7 +10,7 @@
             <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('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>
         <?php foreach ($subtask_paginator->getCollection() as $record): ?>
         <tr>
-- 
cgit v1.2.3