Merge branch 'master' into horde_5_2

horde · Dec 3, 2013 · 8d439d5 · 8d439d5
2 parents f8f007e + 36faf2b
commit 8d439d5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 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>

diff --git a/turba/lib/Turba.php b/turba/lib/Turba.php
@@ -177,7 +177,8 @@ static public function getColumns()
                     $source = array_splice($cols, 0, 1);
                     $columns[$source[0]] = array();
                     foreach ($cols as $col) {
-                        if (isset($GLOBALS['cfgSources'][$source[0]]['map'][$col])) {
+                        if ($col == '__tags' ||
+                            isset($GLOBALS['cfgSources'][$source[0]]['map'][$col])) {
                             $columns[$source[0]][] = $col;
                         }
                     }

diff --git a/whups/docs/CHANGES b/whups/docs/CHANGES
@@ -2,6 +2,7 @@
 v3.0.0-git
 ----------
 
+[jan] Add "show" API link.
 
 
 ---------

diff --git a/whups/lib/Api.php b/whups/lib/Api.php
@@ -9,6 +9,15 @@
  */
 class Whups_Api extends Horde_Registry_Api
 {
+    /**
+     * Links.
+     *
+     * @var array
+     */
+    protected $_links = array(
+        'show' => '%application%/ticket/?id=|ticket|'
+    );
+
     /**
      * Browse through Whups' object tree.
      *

diff --git a/whups/package.xml b/whups/package.xml
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsdl.php">BSD-2-Clause</license>
  <notes>
-* 
+* [jan] Add "show" API link.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1065,7 +1065,7 @@
    <date>2013-11-19</date>
    <license uri="http://www.horde.org/licenses/bsdl.php">BSD-2-Clause</license>
    <notes>
-* 
+* [jan] Add "show" API link.
    </notes>
   </release>
  </changelog>