diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
index d2d38a2bcf3..4dae9b4767d 100644
--- 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
index 6cafe32042d..d75eefa42d4 100644
--- 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
index f2c9a2895c1..301becc3e37 100644
--- a/nag/package.xml
+++ b/nag/package.xml
@@ -33,7 +33,7 @@
GPL-2.0
-*
+* [jan] Don't return future tasks from cost objects API.
@@ -1441,7 +1441,7 @@
2013-10-29
GPL-2.0
-*
+* [jan] Don't return future tasks from cost objects API.
diff --git a/turba/lib/Turba.php b/turba/lib/Turba.php
index dd2e5f1fc1d..da3c927a18f 100644
--- 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
index a135055855e..b58942ff37c 100644
--- 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
index 69500dfd727..696ee2811a2 100644
--- 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
index ceea957db5d..c46bd2ef935 100644
--- a/whups/package.xml
+++ b/whups/package.xml
@@ -27,7 +27,7 @@
BSD-2-Clause
-*
+* [jan] Add "show" API link.
@@ -1065,7 +1065,7 @@
2013-11-19
BSD-2-Clause
-*
+* [jan] Add "show" API link.