[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.17,1.18 cl
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.17,1.18 class.sbox2.inc.php,1.3,1.4 class.uiinfolog.inc.php,1.40,1.41 hook_projects_view.inc.php,1.2,1.3 |
Date: |
Sun, 01 Sep 2002 14:11:36 -0400 |
Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv16744
Modified Files:
class.boinfolog.inc.php class.sbox2.inc.php
class.uiinfolog.inc.php hook_projects_view.inc.php
Log Message:
get infolog to work with (new 3-tier) projects
Index: class.boinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.boinfolog.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.boinfolog.inc.php 12 May 2002 07:13:09 -0000 1.17
--- class.boinfolog.inc.php 1 Sep 2002 18:11:34 -0000 1.18
***************
*** 152,156 ****
$this->projects =
createobject('projects.boprojects');
}
! if (is_object($this->projects) && (list( $proj
) = $this->projects->read_single_project( $proj_id)))
{
return $proj;
--- 152,156 ----
$this->projects =
createobject('projects.boprojects');
}
! if (is_object($this->projects) && ($proj =
$this->projects->read_single_project( $proj_id)))
{
return $proj;
Index: class.sbox2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.sbox2.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sbox2.inc.php 12 May 2002 07:13:09 -0000 1.3
--- class.sbox2.inc.php 1 Sep 2002 18:11:34 -0000 1.4
***************
*** 374,384 ****
while ($projs && list( $key,$proj ) =
each( $projs ))
{
! $content[$proj['id']] =
$proj['title'];
}
}
else
{
! list( $proj ) =
$projects->read_single_project( $id_name );
! if (count($proj))
{
$content = $proj['title'];
--- 374,383 ----
while ($projs && list( $key,$proj ) =
each( $projs ))
{
! $content[$proj['project_id']] =
$proj['title'];
}
}
else
{
! if ($proj =
$projects->read_single_project( $id_name ))
{
$content = $proj['title'];
Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** class.uiinfolog.inc.php 6 Aug 2002 07:42:37 -0000 1.40
--- class.uiinfolog.inc.php 1 Sep 2002 18:11:34 -0000 1.41
***************
*** 129,136 ****
$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 )));
}
if (($action_id != ($addr_id = $info['info_addr_id'])
|| $action != 'addr') &&
--- 129,145 ----
$proj = $this->bo->readProj($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') &&
Index: hook_projects_view.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_projects_view.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hook_projects_view.inc.php 1 May 2002 17:16:27 -0000 1.2
--- hook_projects_view.inc.php 1 Sep 2002 18:11:34 -0000 1.3
***************
*** 18,25 ****
$phpgw->translation->add_app('infolog');
! //echo "<p>hook_projects_view(id=$id)</p>";
$infolog = CreateObject('infolog.uiinfolog');
! $infolog->get_list(True,'proj',$GLOBALS['id']);
$phpgw_info['flags']['currentapp'] = $save_app;
--- 18,25 ----
$phpgw->translation->add_app('infolog');
! //echo "<p>hook_projects_view($GLOBALS['project_id'])</p>";
$infolog = CreateObject('infolog.uiinfolog');
! $infolog->get_list(True,'proj',$GLOBALS['project_id']);
$phpgw_info['flags']['currentapp'] = $save_app;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.17,1.18 class.sbox2.inc.php,1.3,1.4 class.uiinfolog.inc.php,1.40,1.41 hook_projects_view.inc.php,1.2,1.3,
Ralf Becker <address@hidden> <=