[jan] Don't return future tasks from cost objects API.

horde · Nov 28, 2013 · 5501c97 · 5501c97
1 parent e5a0412
commit 5501c97
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.1.4-git
 ----------
 
+[jan] Don't return future tasks from cost objects API.
 
 
 ------

diff --git a/nag/lib/Api.php b/nag/lib/Api.php
@@ -1258,9 +1258,11 @@ public function listCostObjects($criteria)
         );
         $result = array();
         $tasks->reset();
-        $last_week = time() - 7 * 86400;
+        $now = time();
+        $last_week = $now - 7 * 86400;
         while ($task = $tasks->each()) {
-            if ($task->completed && $task->completed_date < $last_week) {
+            if (($task->completed && $task->completed_date < $last_week) ||
+                ($task->start && $task->start > $now)) {
                 continue;
             }
             $result[$task->id] = array(

diff --git a/nag/package.xml b/nag/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [jan] Don&apos;t return future tasks from cost objects API.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1441,7 +1441,7 @@
    <date>2013-10-29</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [jan] Don&apos;t return future tasks from cost objects API.
    </notes>
   </release>
  </changelog>