[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php,1.34.2.6.2.17,1.34.2.6.2.18 class.uiprojects.inc.php,1.47.2.7.2.19,1.47.2.7.2.20

[Bettina Gille <address@hidden>]

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

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

Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.17
retrieving revision 1.34.2.6.2.18
diff -C2 -r1.34.2.6.2.17 -r1.34.2.6.2.18
*** class.soprojects.inc.php    15 Jun 2003 23:00:54 -0000      1.34.2.6.2.17
--- class.soprojects.inc.php    16 Jun 2003 21:47:24 -0000      1.34.2.6.2.18
***************
*** 376,379 ****
--- 376,384 ----
                                                                . ' AND month=' 
. $values['monthdate'],__LINE__,__FILE__);
                        }
+ 
+                       if ($values['status'] == 'archive')
+                       {
+                               $this->db->query("Update phpgw_p_projects set 
status='archive' WHERE parent=" . $values['project_id'],__LINE__,__FILE__);
+                       }
                }
  

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.19
retrieving revision 1.47.2.7.2.20
diff -C2 -r1.47.2.7.2.19 -r1.47.2.7.2.20
*** class.uiprojects.inc.php    15 Jun 2003 23:00:54 -0000      1.47.2.7.2.19
--- class.uiprojects.inc.php    16 Jun 2003 21:47:24 -0000      1.47.2.7.2.20
***************
*** 190,194 ****
                }
  
!               function status_format($status = '')
                {
                        if (!$status)
--- 190,194 ----
                }
  
!               function status_format($status = '', $showarchive = False)
                {
                        if (!$status)
***************
*** 205,210 ****
  
                        $status_list = '<option value="active"' . $stat_sel[0] 
. '>' . lang('Active') . '</option>' . "\n"
!                                               . '<option value="nonactive"' . 
$stat_sel[1] . '>' . lang('Nonactive') . '</option>' . "\n"
!                                               . '<option value="archive"' . 
$stat_sel[2] . '>' . lang('Archive') . '</option>' . "\n";
                        return $status_list;
                }
--- 205,214 ----
  
                        $status_list = '<option value="active"' . $stat_sel[0] 
. '>' . lang('Active') . '</option>' . "\n"
!                                               . '<option value="nonactive"' . 
$stat_sel[1] . '>' . lang('Nonactive') . '</option>' . "\n";
! 
!                       if ($showarchive)
!                       {
!                               $status_list .= '<option value="archive"' . 
$stat_sel[2] . '>' . lang('Archive') . '</option>' . "\n";
!                       }
                        return $status_list;
                }
***************
*** 616,620 ****
                        
$GLOBALS['phpgw']->template->set_var('month',$month['monthformatted']);
  
!                       
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status']));
  
                        $GLOBALS['phpgw']->template->set_var('access','<input 
type="checkbox" name="values[access]" value="True"' . ($values['access'] == 
'private'?' checked':'') . '>');
--- 620,624 ----
                        
$GLOBALS['phpgw']->template->set_var('month',$month['monthformatted']);
  
!                       
$GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($values['status'],True));
  
                        $GLOBALS['phpgw']->template->set_var('access','<input 
type="checkbox" name="values[access]" value="True"' . ($values['access'] == 
'private'?' checked':'') . '>');