forked from extern/egroupware
get infolog to work with (new 3-tier) projects
This commit is contained in:
parent
9d50404d22
commit
f27c38c42c
@ -151,7 +151,7 @@
|
||||
{
|
||||
$this->projects = createobject('projects.boprojects');
|
||||
}
|
||||
if (is_object($this->projects) && (list( $proj ) = $this->projects->read_single_project( $proj_id)))
|
||||
if (is_object($this->projects) && ($proj = $this->projects->read_single_project( $proj_id)))
|
||||
{
|
||||
return $proj;
|
||||
}
|
||||
|
@ -373,13 +373,12 @@
|
||||
$content = array();
|
||||
while ($projs && list( $key,$proj ) = each( $projs ))
|
||||
{
|
||||
$content[$proj['id']] = $proj['title'];
|
||||
$content[$proj['project_id']] = $proj['title'];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
list( $proj ) = $projects->read_single_project( $id_name );
|
||||
if (count($proj))
|
||||
if ($proj = $projects->read_single_project( $id_name ))
|
||||
{
|
||||
$content = $proj['title'];
|
||||
// $customer_id = $proj['customer'];
|
||||
|
@ -128,10 +128,19 @@
|
||||
if (($action_id != ($proj_id = $info['info_proj_id']) || $action != 'proj') &&
|
||||
$proj = $this->bo->readProj($proj_id))
|
||||
{
|
||||
$subject .= $this->html->bold($this->html->a_href($proj['title'],
|
||||
'/index.php',$this->menuaction()+
|
||||
array( 'filter' => $filter,'action' => 'proj',
|
||||
'action_id' => $proj_id )));
|
||||
$subject .= $this->html->bold($this->html->a_href($proj['title'],'/index.php',
|
||||
file_exists(PHPGW_SERVER_ROOT.'/projects') &&
|
||||
$GLOBALS['phpgw_info']['user']['apps']['projects']['enabled'] ?
|
||||
array(
|
||||
'menuaction' => 'projects.uiprojects.view_project',
|
||||
'action' => 'mains',
|
||||
'project_it' => $proj_id
|
||||
) : $this->menuaction() + array(
|
||||
'filter' => $filter,
|
||||
'action' => 'proj',
|
||||
'action_id' => $proj_id
|
||||
)
|
||||
));
|
||||
}
|
||||
if (($action_id != ($addr_id = $info['info_addr_id']) || $action != 'addr') &&
|
||||
$addr = $this->bo->readAddr($addr_id))
|
||||
|
@ -17,9 +17,9 @@
|
||||
|
||||
$phpgw->translation->add_app('infolog');
|
||||
|
||||
//echo "<p>hook_projects_view(id=$id)</p>";
|
||||
//echo "<p>hook_projects_view($GLOBALS['project_id'])</p>";
|
||||
|
||||
$infolog = CreateObject('infolog.uiinfolog');
|
||||
$infolog->get_list(True,'proj',$GLOBALS['id']);
|
||||
$infolog->get_list(True,'proj',$GLOBALS['project_id']);
|
||||
|
||||
$phpgw_info['flags']['currentapp'] = $save_app;
|
||||
|
Loading…
Reference in New Issue
Block a user