[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.uiprojecthours.inc.php,1.22.
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.uiprojecthours.inc.php,1.22.2.5.2.4,1.22.2.5.2.5 |
Date: |
Tue, 10 Jun 2003 18:03:37 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv22774/inc
Modified Files:
Tag: Version-0_9_16-branch
class.uiprojecthours.inc.php
Log Message:
update
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.4
retrieving revision 1.22.2.5.2.5
diff -C2 -r1.22.2.5.2.4 -r1.22.2.5.2.5
*** class.uiprojecthours.inc.php 9 Jun 2003 22:56:41 -0000
1.22.2.5.2.4
--- class.uiprojecthours.inc.php 10 Jun 2003 22:03:35 -0000
1.22.2.5.2.5
***************
*** 471,475 ****
--- 471,480 ----
{
$values =
$this->boprojecthours->read_single_hours($hours_id);
+
+ $activity_id = $values['activity_id'];
+ $project_id = $values['project_id'];
+ $pro_parent = $values['pro_parent'];
}
+
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status']));
$GLOBALS['phpgw']->template->set_var('employee_list',$this->employee_format($values['employee']));
***************
*** 557,569 ****
if ($values['pro_parent'] != 0)
{
!
$GLOBALS['phpgw']->template->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['pro_parent'])));
$GLOBALS['phpgw']->template->set_var('lang_pro_parent',lang('Main project:'));
}
!
$GLOBALS['phpgw']->template->set_var('project_name',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$values['project_id'])));
!
$GLOBALS['phpgw']->template->set_var('activity_list',$this->boprojects->select_hours_activities($values['project_id'],$values['activity_id']));
! $coordinator =
$this->boprojects->return_value('co',$values['project_id']);
if
($this->boprojects->check_perms($grants[$coordinator],PHPGW_ACL_DELETE) ||
$coordinator == $this->account)
--- 562,574 ----
if ($values['pro_parent'] != 0)
{
!
$GLOBALS['phpgw']->template->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$pro_parent)));
$GLOBALS['phpgw']->template->set_var('lang_pro_parent',lang('Main project:'));
}
!
$GLOBALS['phpgw']->template->set_var('project_name',$GLOBALS['phpgw']->strip_html($this->boprojects->return_value('pro',$project_id)));
!
$GLOBALS['phpgw']->template->set_var('activity_list',$this->boprojects->select_hours_activities($project_id,$activity_id));
! $coordinator =
$this->boprojects->return_value('co',$project_id);
if
($this->boprojects->check_perms($grants[$coordinator],PHPGW_ACL_DELETE) ||
$coordinator == $this->account)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.uiprojecthours.inc.php,1.22.2.5.2.4,1.22.2.5.2.5,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: timetrack/setup phpgw_de.lang,1.1.2.2.2.1,1.1.2.2.2.2 phpgw_en.lang,1.3.2.7,1.3.2.7.2.1 phpgw_es.lang,1.2.2.1,1.2.2.1.2.1 phpgw_fi.lang,1.1.2.2,1.1.2.2.2.1 phpgw_fr.lang,1.1.2.6,1.1.2.6.2.1 phpgw_pl.lang,1.1.2.2,1.1.2.2.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: projects/templates/default hours_formhours.tpl,1.20.4.1,1.20.4.2
- Previous by thread:
[Phpgroupware-cvs] CVS: timetrack/setup phpgw_de.lang,1.1.2.2.2.1,1.1.2.2.2.2 phpgw_en.lang,1.3.2.7,1.3.2.7.2.1 phpgw_es.lang,1.2.2.1,1.2.2.1.2.1 phpgw_fi.lang,1.1.2.2,1.1.2.2.2.1 phpgw_fr.lang,1.1.2.6,1.1.2.6.2.1 phpgw_pl.lang,1.1.2.2,1.1.2.2.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: projects/templates/default hours_formhours.tpl,1.20.4.1,1.20.4.2
- Index(es):