[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.14,1.42.2.5.2.15 class.uiprojects.inc.php,1.47.2.7.2.13,1.47.2.7.2.14

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv27834/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.14
retrieving revision 1.42.2.5.2.15
diff -C2 -r1.42.2.5.2.14 -r1.42.2.5.2.15
*** class.boprojects.inc.php    12 Jun 2003 21:28:21 -0000      1.42.2.5.2.14
--- class.boprojects.inc.php    14 Jun 2003 20:37:52 -0000      1.42.2.5.2.15
***************
*** 551,554 ****
--- 551,560 ----
                        }
  
+                       if (!$values['coordinator'])
+                       {
+                               $error[] = lang('please choose a project 
coordinator');
+                       }
+ 
+ 
                        if (strlen($values['title']) >= 255)
                        {

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.13
retrieving revision 1.47.2.7.2.14
diff -C2 -r1.47.2.7.2.13 -r1.47.2.7.2.14
*** class.uiprojects.inc.php    12 Jun 2003 21:28:21 -0000      1.47.2.7.2.13
--- class.uiprojects.inc.php    14 Jun 2003 20:37:52 -0000      1.47.2.7.2.14
***************
*** 611,634 ****
                        
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status']));
  
-                       
switch($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection'])
-                       {
-                               case 'popup':
-                                       if ($values['coordinator'])
-                                       {
-                                               
$GLOBALS['phpgw']->template->set_var('accountid',$values['coordinator']);
-                                               $co = 
$GLOBALS['phpgw']->accounts->get_account_data($values['coordinator']);
-                                               
$GLOBALS['phpgw']->template->set_var('accountname',$GLOBALS['phpgw']->common->display_fullname($co[$values['coordinator']]['lid'],
-                                                                               
                                                                        
$co[$values['coordinator']]['firstname'],$co[$values['coordinator']]['lastname']));
-                                       }
-                                       
$GLOBALS['phpgw']->template->set_var('clisthandle','');
-                                       
$GLOBALS['phpgw']->template->fp('cfieldhandle','cfield',True);
-                                       break;
-                               default:
-                                       
$GLOBALS['phpgw']->template->set_var('coordinator_list',$this->coordinator_format($values['coordinator']));
-                                               
$GLOBALS['phpgw']->template->set_var('cfieldhandle','');
-                                               
$GLOBALS['phpgw']->template->fp('clisthandle','clist',True);
-                                       break;
-                       }
- 
                        $GLOBALS['phpgw']->template->set_var('access','<input 
type="checkbox" name="values[access]" value="True"' . ($values['access'] == 
'private'?' checked':'') . '>');
  
--- 611,614 ----
***************
*** 662,665 ****
--- 642,646 ----
                                {
                                        
$GLOBALS['phpgw']->template->set_var('lang_choose',($project_id?'':lang('generate
 job id ?')));
+ 
                                        $parent = 
$this->bo->read_single_project($pro_parent);
  
***************
*** 676,679 ****
--- 657,690 ----
                                
$GLOBALS['phpgw']->template->set_var('investment_nr',$parent['investment_nr']);
                                
$GLOBALS['phpgw']->template->set_var('pcosts',$parent['pcosts']);
+ 
+                               if(!$values['coordinator'])
+                               {
+                                       $values['coordinator'] = 
$parent['coordinator'];
+                               }
+ 
+                               if(!$values['customer'])
+                               {
+                                       $values['customer'] = 
$parent['customer'];
+                               }
+                       }
+ 
+                       
switch($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection'])
+                       {
+                               case 'popup':
+                                       if ($values['coordinator'])
+                                       {
+                                               
$GLOBALS['phpgw']->template->set_var('accountid',$values['coordinator']);
+                                               $co = 
$GLOBALS['phpgw']->accounts->get_account_data($values['coordinator']);
+                                               
$GLOBALS['phpgw']->template->set_var('accountname',$GLOBALS['phpgw']->common->display_fullname($co[$values['coordinator']]['lid'],
+                                                                               
                                                                        
$co[$values['coordinator']]['firstname'],$co[$values['coordinator']]['lastname']));
+                                       }
+                                       
$GLOBALS['phpgw']->template->set_var('clisthandle','');
+                                       
$GLOBALS['phpgw']->template->fp('cfieldhandle','cfield',True);
+                                       break;
+                               default:
+                                       
$GLOBALS['phpgw']->template->set_var('coordinator_list',$this->coordinator_format($values['coordinator']));
+                                               
$GLOBALS['phpgw']->template->set_var('cfieldhandle','');
+                                               
$GLOBALS['phpgw']->template->fp('clisthandle','clist',True);
+                                       break;
                        }