extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

get infolog to work with (new 3-tier) projects

Browse Source
This commit is contained in:
Ralf Becker 2002-09-01 18:11:57 +00:00
parent 9d50404d22
commit f27c38c42c
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infolog/inc/class.boinfolog.inc.php
View File

@ -151,7 +151,7 @@
{ {
$this->projects = createobject('projects.boprojects'); $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; return $proj;
} }

5
infolog/inc/class.sbox2.inc.php
View File

@ -373,13 +373,12 @@
$content = array(); $content = array();
while ($projs && list( $key,$proj ) = each( $projs )) while ($projs && list( $key,$proj ) = each( $projs ))
{ {
$content[$proj['id']] = $proj['title']; $content[$proj['project_id']] = $proj['title'];
} }
} }
else else
{ {
list( $proj ) = $projects->read_single_project( $id_name ); if ($proj = $projects->read_single_project( $id_name ))
if (count($proj))
{ {
$content = $proj['title']; $content = $proj['title'];
// $customer_id = $proj['customer']; // $customer_id = $proj['customer'];

17
infolog/inc/class.uiinfolog.inc.php
View File

@ -128,10 +128,19 @@
if (($action_id != ($proj_id = $info['info_proj_id']) || $action != 'proj') && if (($action_id != ($proj_id = $info['info_proj_id']) || $action != 'proj') &&
$proj = $this->bo->readProj($proj_id)) $proj = $this->bo->readProj($proj_id))
{ {
$subject .= $this->html->bold($this->html->a_href($proj['title'], $subject .= $this->html->bold($this->html->a_href($proj['title'],'/index.php',
'/index.php',$this->menuaction()+ file_exists(PHPGW_SERVER_ROOT.'/projects') &&
array( 'filter' => $filter,'action' => 'proj', $GLOBALS['phpgw_info']['user']['apps']['projects']['enabled'] ?
'action_id' => $proj_id ))); 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') && if (($action_id != ($addr_id = $info['info_addr_id']) || $action != 'addr') &&
$addr = $this->bo->readAddr($addr_id)) $addr = $this->bo->readAddr($addr_id))

4
infolog/inc/hook_projects_view.inc.php
View File

@ -17,9 +17,9 @@
$phpgw->translation->add_app('infolog'); $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 = CreateObject('infolog.uiinfolog');
$infolog->get_list(True,'proj',$GLOBALS['id']); $infolog->get_list(True,'proj',$GLOBALS['project_id']);
$phpgw_info['flags']['currentapp'] = $save_app; $phpgw_info['flags']['currentapp'] = $save_app;