mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 00:58:55 +01:00
adding some debug and have it commented out to research the issue in tracker #1876 (Timesheet, in detail view, not shows link to the owner project)
This commit is contained in:
parent
f4cf482f4f
commit
87247b6ca4
@ -126,6 +126,7 @@ class solink
|
|||||||
{
|
{
|
||||||
$only_app = substr($only_app,1);
|
$only_app = substr($only_app,1);
|
||||||
}
|
}
|
||||||
|
#var_dump($not_only);echo "$only_app<br>";
|
||||||
$links = array();
|
$links = array();
|
||||||
foreach(self::$db->select(self::TABLE,'*',self::$db->expression(self::TABLE,'(',array(
|
foreach(self::$db->select(self::TABLE,'*',self::$db->expression(self::TABLE,'(',array(
|
||||||
'link_app1' => $app,
|
'link_app1' => $app,
|
||||||
@ -155,12 +156,13 @@ class solink
|
|||||||
$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
|
$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
|
||||||
$linked_id = $left ? $row['link_id2'] : $row['link_id1'];
|
$linked_id = $left ? $row['link_id2'] : $row['link_id1'];
|
||||||
$app_id = $left ? $row['link_id1'] : $row['link_id2'];
|
$app_id = $left ? $row['link_id1'] : $row['link_id2'];
|
||||||
|
|
||||||
if ($only_app && $not_only == ($linked_app == $only_app) || !$GLOBALS['egw_info']['user']['apps'][$linked_app])
|
if ($only_app && $not_only == ($linked_app == $only_app) || !$GLOBALS['egw_info']['user']['apps'][$linked_app])
|
||||||
{
|
{
|
||||||
|
#echo "$linked_app == $only_app, ";var_dump($linked_app == $only_app);echo " ->dont return a link<br>";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$links[$app_id][$row['link_id']] = $only_app && !$not_only ? $linked_id : array(
|
#echo "returning ".(($only_app && !$not_only) ? " linkid:".$linked_id : " full array with linkid $linked_id")."<br>";
|
||||||
|
$links[$app_id][$row['link_id']] = ($only_app && !$not_only) ? $linked_id : array(
|
||||||
'app' => $linked_app,
|
'app' => $linked_app,
|
||||||
'id' => $linked_id,
|
'id' => $linked_id,
|
||||||
'remark' => $row['link_remark'],
|
'remark' => $row['link_remark'],
|
||||||
|
Loading…
Reference in New Issue
Block a user