From 253996901a10918e3207d46839cdfdc90d200e72 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 14 Mar 2015 20:53:33 -0400
Subject: Calculate the time spent based on the timetable

---
 app/Controller/Base.php   | 1 -
 app/Controller/Config.php | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/Controller')

diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index ec202c06..a4e94343 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -67,7 +67,6 @@ use Symfony\Component\EventDispatcher\Event;
  * @property \Model\CommentHistory         $commentHistory
  * @property \Model\SubtaskHistory         $subtaskHistory
  * @property \Model\SubtaskTimeTracking    $subtaskTimeTracking
- * @property \Model\TimeTracking           $timeTracking
  * @property \Model\User                   $user
  * @property \Model\UserSession            $userSession
  * @property \Model\Webhook                $webhook
diff --git a/app/Controller/Config.php b/app/Controller/Config.php
index 01c7ad53..bee897be 100644
--- a/app/Controller/Config.php
+++ b/app/Controller/Config.php
@@ -38,7 +38,11 @@ class Config extends Base
     {
         if ($this->request->isPost()) {
 
-            $values = $this->request->getValues() + array('subtask_restriction' => 0, 'subtask_time_tracking' => 0);
+            $values =  $this->request->getValues();
+
+            if ($redirect === 'board') {
+                $values += array('subtask_restriction' => 0, 'subtask_time_tracking' => 0);
+            }
 
             if ($this->config->save($values)) {
                 $this->config->reload();
-- 
cgit v1.2.3