From 7e6309dd7e10c669a6e7615fad40efc564c6f1f1 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Wed, 12 Aug 2015 22:45:59 -0400
Subject: Improve bug fix

---
 app/Model/SubtaskTimeTracking.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'app/Model')

diff --git a/app/Model/SubtaskTimeTracking.php b/app/Model/SubtaskTimeTracking.php
index 8f8aac94..997031e8 100644
--- a/app/Model/SubtaskTimeTracking.php
+++ b/app/Model/SubtaskTimeTracking.php
@@ -340,17 +340,24 @@ class SubtaskTimeTracking extends Base
     public function updateTaskTimeTracking($task_id)
     {
         $result = $this->calculateSubtaskTime($task_id);
+        $values = array();
 
-        if (empty($result['total_spent']) && empty($result['total_estimated'])) {
+        if ($result['total_spent'] > 0) {
+            $values['time_spent'] = $result['total_spent'];
+        }
+
+        if ($result['total_estimated'] > 0) {
+            $values['time_estimated'] = $result['total_estimated'];
+        }
+
+        if (empty($values)) {
             return true;
         }
 
         return $this->db
                     ->table(Task::TABLE)
                     ->eq('id', $task_id)
-                    ->sumColumn('time_spent', $result['total_spent'])
-                    ->sumColumn('time_estimated', $result['total_estimated'])
-                    ->update();
+                    ->update($values);
     }
 
     /**
-- 
cgit v1.2.3