[Phpgroupware-cvs] CVS: preferences/inc class.bocategories.inc.php,1.11,1.12 class.uicategories.inc.php,1.19,1.20

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv27146/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/preferences/inc/class.bocategories.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.bocategories.inc.php  12 Oct 2002 18:27:22 -0000      1.11
--- class.bocategories.inc.php  12 Oct 2002 21:17:59 -0000      1.12
***************
*** 20,23 ****
--- 20,24 ----
                var $sort;
                var $order;
+               var $cat_id;
  
                function bocategories($cats_app)
***************
*** 82,86 ****
                        $this->sort             = $data['sort'];
                        $this->order    = $data['order'];
!                       $this->cat_id   = $data['cat_id'];
                }
  
--- 83,90 ----
                        $this->sort             = $data['sort'];
                        $this->order    = $data['order'];
!                       if(isset($data['cat_id']))
!                       {
!                               $this->cat_id = $data['cat_id'];
!                       }
                }
  

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uicategories.inc.php  12 Oct 2002 20:45:12 -0000      1.19
--- class.uicategories.inc.php  12 Oct 2002 21:17:59 -0000      1.20
***************
*** 53,59 ****
                                'query'         => $this->query,
                                'sort'          => $this->sort,
!                               'order'         => $this->order,
!                               'cat_id'        => $this->cat_id
                        );
                        $this->bo->save_sessiondata($data,$cats_app);
                }
--- 53,63 ----
                                'query'         => $this->query,
                                'sort'          => $this->sort,
!                               'order'         => $this->order
                        );
+ 
+                       if(isset($this->cat_id))
+                       {
+                               $data['cat_id'] = $this->cat_id;
+                       }
                        $this->bo->save_sessiondata($data,$cats_app);
                }
***************
*** 351,355 ****
                                for($i=0;$i<count($edata);$i++)
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('td_data$categories[$i]['cat_id']$categories[$i]['cat_id']','<input
 name="cat_data[' . $edata[$i] . ']" size="50" value="' . $cat_data[$edata[$i]] 
. '">');
                                        
$GLOBALS['phpgw']->template->set_var('lang_data',lang($edata[$i]));
                                        
$GLOBALS['phpgw']->template->fp('rows','data_row',True);
--- 355,359 ----
                                for($i=0;$i<count($edata);$i++)
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('td_data','<input name="cat_data[' . 
$edata[$i] . ']" size="50" value="' . $cat_data[$edata[$i]] . '">');
                                        
$GLOBALS['phpgw']->template->set_var('lang_data',lang($edata[$i]));
                                        
$GLOBALS['phpgw']->template->fp('rows','data_row',True);
***************
*** 431,434 ****
--- 435,439 ----
  
                        $link_data['menuaction'] = 
'preferences.uicategories.edit';
+                       $link_data['cat_id'] = $this->cat_id;
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
***************
*** 556,559 ****
--- 561,565 ----
  
                        $link_data['menuaction'] = 
'preferences.uicategories.delete';
+                       $link_data['cat_id'] = $this->cat_id;
                        
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
                        
$GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes'));