[Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php, 1.8.2.1.2.4, 1.8.2.1.2.5 class.uiprojecthours.inc.php, 1.22.2.5.2.10, 1.22.2.5.2.11

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv23548/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.boprojecthours.inc.php class.uiprojecthours.inc.php 
Log Message:
update

Index: class.boprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojecthours.inc.php,v
retrieving revision 1.8.2.1.2.4
retrieving revision 1.8.2.1.2.5
diff -C2 -r1.8.2.1.2.4 -r1.8.2.1.2.5
*** class.boprojecthours.inc.php        24 Aug 2003 22:53:18 -0000      
1.8.2.1.2.4
--- class.boprojecthours.inc.php        26 Aug 2003 01:52:50 -0000      
1.8.2.1.2.5
***************
*** 241,245 ****
                        }
  
!                       if ($values['hours_id'] && $values['hours_id'] != 0)
                        {
                                $this->soprojecthours->edit_hours($values);
--- 241,250 ----
                        }
  
!                       if (!$values['employee'])
!                       {
!                               $values['employee'] = 
$this->soprojecthours->account;
!                       }
! 
!                       if (intval($values['hours_id']) > 0)
                        {
                                $this->soprojecthours->edit_hours($values);

Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.10
retrieving revision 1.22.2.5.2.11
diff -C2 -r1.22.2.5.2.10 -r1.22.2.5.2.11
*** class.uiprojecthours.inc.php        24 Aug 2003 22:53:19 -0000      
1.22.2.5.2.10
--- class.uiprojecthours.inc.php        26 Aug 2003 01:52:50 -0000      
1.22.2.5.2.11
***************
*** 467,470 ****
--- 467,471 ----
                        $GLOBALS['phpgw']->template->set_block('hours_' . 
$form,'add','addhandle');
                        $GLOBALS['phpgw']->template->set_block('hours_' . 
$form,'edit','edithandle');
+                       $GLOBALS['phpgw']->template->set_block('hours_' . 
$form,'emp','emphandle');
  
                        
$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" 
name="referer" value="' . $referer . '">');
***************
*** 484,488 ****
  
                        
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status']));
-                       
$GLOBALS['phpgw']->template->set_var('employee_list',$this->employee_format($values['employee']));
  
                        $sdate = $this->hdate_format($values['sdate']);
--- 485,488 ----
***************
*** 585,588 ****
--- 585,594 ----
                        {
                                $deletehour = True;
+                       }
+ 
+                       if 
($this->boprojects->check_perms($grants[$coordinator],PHPGW_ACL_EDIT) || 
$coordinator == $this->account)
+                       {
+                               
$GLOBALS['phpgw']->template->set_var('employee_list',$this->employee_format($values['employee']));
+                               
$GLOBALS['phpgw']->template->fp('emphandle','emp',True);
                        }