[Phpgroupware-cvs] CVS: admin/inc class.bocategories.inc.php,1.14,1.15 class.uicategories.inc.php,1.26,1.27

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv14735/inc

Modified Files:
        class.bocategories.inc.php class.uicategories.inc.php 
Log Message:
update edit_cats to move the subtree with the cat if the parent changes

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.bocategories.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.bocategories.inc.php  12 Oct 2002 18:01:21 -0000      1.14
--- class.bocategories.inc.php  12 Oct 2002 20:45:27 -0000      1.15
***************
*** 134,138 ****
                function formatted_list($data)
                {
!                       if ($data['global_cats'])
                        {
                                return 
$this->cats->formated_list($data['select'],$data['all'],$data['parent'],True);
--- 134,138 ----
                function formatted_list($data)
                {
!                       if ($data['globals'])
                        {
                                return 
$this->cats->formated_list($data['select'],$data['all'],$data['parent'],True);

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uicategories.inc.php  12 Oct 2002 18:43:58 -0000      1.26
--- class.uicategories.inc.php  12 Oct 2002 20:45:27 -0000      1.27
***************
*** 153,159 ****
                                
$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
  
!                               $id = $categories[$i]['cat_id'];
!                               $level = $categories[$i]['level'];
!                               $cat_name = 
$GLOBALS['phpgw']->strip_html($categories[$i]['name']);
  
                                if ($level > 0)
--- 153,158 ----
                                
$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
  
!                               $level          = $categories[$i]['level'];
!                               $cat_name       = 
$GLOBALS['phpgw']->strip_html($categories[$i]['name']);
  
                                if ($level > 0)
***************
*** 189,193 ****
  
                                $link_data['menuaction'] = 
'admin.uicategories.add';
!                               $link_data['cat_parent'] = $id;
                                
$GLOBALS['phpgw']->template->set_var('add_sub',$GLOBALS['phpgw']->link('/index.php',$link_data));
                                
$GLOBALS['phpgw']->template->set_var('lang_sub_entry',lang('Add sub'));
--- 188,192 ----
  
                                $link_data['menuaction'] = 
'admin.uicategories.add';
!                               $link_data['parent'] = 
$categories[$i]['cat_id'];
                                
$GLOBALS['phpgw']->template->set_var('add_sub',$GLOBALS['phpgw']->link('/index.php',$link_data));
                                
$GLOBALS['phpgw']->template->set_var('lang_sub_entry',lang('Add sub'));
***************
*** 208,212 ****
                                if ($show_edit_del)
                                {
!                                       $link_data['cat_id'] = $id;
                                        $link_data['menuaction'] = 
'admin.uicategories.edit';
                                        
$GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 207,211 ----
                                if ($show_edit_del)
                                {
!                                       $link_data['cat_id'] = 
$categories[$i]['cat_id'];
                                        $link_data['menuaction'] = 
'admin.uicategories.edit';
                                        
$GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php',$link_data));
***************
*** 228,232 ****
  
                        $link_data['menuaction'] = 'admin.uicategories.add';
!                       $link_data['cat_parent'] = '';
                        
$GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
--- 227,231 ----
  
                        $link_data['menuaction'] = 'admin.uicategories.add';
!                       $link_data['parent'] = '';
                        
$GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
***************
*** 237,241 ****
                function add()
                {
!                       $global_cats = 
get_var('global_cats',array('POST','GET'));
  
                        $link_data = array
--- 236,241 ----
                function add()
                {
!                       $global_cats    = 
get_var('global_cats',array('POST','GET'));
!                       $parent                 = 
get_var('parent',array('GET'));
  
                        $link_data = array
***************
*** 290,297 ****
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
!                       
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array('select'
           => 'select',
!                                                                               
                                                                                
                                'all'                   => 'all',
!                                                                               
                                                                                
                                'parent'                => $values['parent'],
!                                                                               
                                                                                
                                'global_cats'   => $global_cats)));
  
                        
$GLOBALS['phpgw']->template->set_var('cat_name',$values['name']);
--- 290,302 ----
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
!                       if ($values['parent'])
!                       {
!                               $parent = $values['parent'];
!                       }
! 
!                       
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formated_list(array('format'
      => 'select',
!                                                                               
                                                                                
                                'type'          => 'all',
!                                                                               
                                                                                
                                'selected'      => $parent,
!                                                                               
                                                                                
                                'globals'       => $global_cats)));
  
                        
$GLOBALS['phpgw']->template->set_var('cat_name',$values['name']);
***************
*** 349,353 ****
                                {
                                        $this->cat_id = 
$this->bo->save_cat($values);
!                                       
$GLOBALS['phpgw']->template->set_var('message',lang('Category x has been 
updated !',$cat_name));
                                }
                        }
--- 354,358 ----
                                {
                                        $this->cat_id = 
$this->bo->save_cat($values);
!                                       
$GLOBALS['phpgw']->template->set_var('message',lang('Category x has been 
updated !',$values['name']));
                                }
                        }