[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.2.29, 1.42.2.5.2.30 class.uiprojects.inc.php, 1.47.2.7.2.33, 1.47.2.7.2.34

[Bettina Gille <address@hidden>]

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

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

Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.29
retrieving revision 1.42.2.5.2.30
diff -C2 -r1.42.2.5.2.29 -r1.42.2.5.2.30
*** class.boprojects.inc.php    11 Sep 2003 21:12:24 -0000      1.42.2.5.2.29
--- class.boprojects.inc.php    11 Sep 2003 23:36:19 -0000      1.42.2.5.2.30
***************
*** 670,674 ****
                        if ($action == 'mains')
                        {
!                               if ((!$values['budget'] || $values['budget'] == 
0) && $values['pcosts'])
                                {
                                        $error[] = lang('please specify the 
budget');
--- 670,674 ----
                        if ($action == 'mains')
                        {
!                               if ((!$values['budget'] || $values['budget'] == 
0) && $values['pcosts'] > 0)
                                {
                                        $error[] = lang('please specify the 
budget');

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.33
retrieving revision 1.47.2.7.2.34
diff -C2 -r1.47.2.7.2.33 -r1.47.2.7.2.34
*** class.uiprojects.inc.php    11 Sep 2003 21:12:24 -0000      1.47.2.7.2.33
--- class.uiprojects.inc.php    11 Sep 2003 23:36:19 -0000      1.47.2.7.2.34
***************
*** 448,458 ****
                function employee_format($data)
                {
-                       $selected       = 
(isset($data['selected'])?$data['selected']:'');
                        $type           = ($data['type']?$data['type']:'list');
                        $project_id     = 
($data['project_id']?$data['project_id']:0);
  
                        if (!is_array($selected))
                        {
!                               $selected = explode(',',$selected);
                        }
  
--- 448,458 ----
                function employee_format($data)
                {
                        $type           = ($data['type']?$data['type']:'list');
                        $project_id     = 
($data['project_id']?$data['project_id']:0);
  
+                       $selected = $this->bo->get_acl_for_project($project_id);
                        if (!is_array($selected))
                        {
!                               $selected = array();
                        }
  
***************
*** 463,472 ****
                                        break;
                                case 'field':
!                                       $employees = 
$this->bo->selected_employees($project_id);
!                                       $selected = 
$this->bo->get_acl_for_project($project_id);
                                        break;
                        }
  
                        //_debug_array($employees);
                        while (is_array($employees) && list($null,$account) = 
each($employees))
                        {
--- 463,472 ----
                                        break;
                                case 'field':
!                                       $employees      = 
$this->bo->selected_employees($project_id);
                                        break;
                        }
  
                        //_debug_array($employees);
+                       //_debug_array($selected);
                        while (is_array($employees) && list($null,$account) = 
each($employees))
                        {
***************
*** 791,795 ****
                                                
$GLOBALS['phpgw']->template->fp('clisthandle','clist',True);
  
!                                       
$GLOBALS['phpgw']->template->set_var('employee_list',$this->employee_format(array('selected'
 => $values['employees'],'project_id' => $project_id)));
                                                
$GLOBALS['phpgw']->template->set_var('efieldhandle','');
                                                
$GLOBALS['phpgw']->template->fp('elisthandle','elist',True);
--- 791,795 ----
                                                
$GLOBALS['phpgw']->template->fp('clisthandle','clist',True);
  
!                                       
$GLOBALS['phpgw']->template->set_var('employee_list',$this->employee_format(array('project_id'
 => $project_id)));
                                                
$GLOBALS['phpgw']->template->set_var('efieldhandle','');
                                                
$GLOBALS['phpgw']->template->fp('elisthandle','elist',True);