[Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.6.2.5,1.6.2.6

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.uicategories.inc.php 
Log Message:
fix for bug 1286

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -r1.6.2.5 -r1.6.2.6
*** class.uicategories.inc.php  12 Sep 2002 16:32:11 -0000      1.6.2.5
--- class.uicategories.inc.php  4 Oct 2002 19:31:20 -0000       1.6.2.6
***************
*** 271,278 ****
                                $values = array
                                (
!                                       'parent'        => $cat_parent,
!                                       'descr'         => $cat_description,
!                                       'name'          => $cat_name,
!                                       'access'        => 'public'
                                );
  
--- 271,278 ----
                                $values = array
                                (
!                                       'parent'                => $cat_parent,
!                                       'descr'                 => 
$cat_description,
!                                       'name'                  => $cat_name,
!                                       'access'                => 'public'
                                );
  
***************
*** 304,307 ****
--- 304,314 ----
                function edit()
                {
+                       $new_parent                     = 
$GLOBALS['HTTP_POST_VARS']['new_parent'];
+                       $submit                         = 
$GLOBALS['HTTP_POST_VARS']['submit'];
+                       $cat_parent                     = 
$GLOBALS['HTTP_POST_VARS']['cat_parent'];
+                       $cat_name                       = 
$GLOBALS['HTTP_POST_VARS']['cat_name'];
+                       $cat_description        = 
$GLOBALS['HTTP_POST_VARS']['cat_description'];
+                       $old_parent                     = 
$GLOBALS['HTTP_POST_VARS']['old_parent'];
+ 
                        $link_data = array
                        (
***************
*** 320,335 ****
                        $this->set_langs();
  
-                       $new_parent                     = 
$GLOBALS['HTTP_POST_VARS']['new_parent'];
-                       $submit                         = 
$GLOBALS['HTTP_POST_VARS']['submit'];
-                       $cat_parent                     = 
$GLOBALS['HTTP_POST_VARS']['cat_parent'];
-                       $cat_name                       = 
$GLOBALS['HTTP_POST_VARS']['cat_name'];
-                       $cat_description        = 
$GLOBALS['HTTP_POST_VARS']['cat_description'];
- 
                        $this->template->set_file(array('form' => 
'category_form.tpl'));
                        $this->template->set_block('form','add','addhandle');
                        $this->template->set_block('form','edit','edithandle');
  
-                       $hidden_vars = '<input type="hidden" name="cat_id" 
value="' . $this->cat_id . '">' . "\n";
-                       $this->template->set_var('hidden_vars',$hidden_vars);
                        
$this->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
--- 327,334 ----
***************
*** 343,351 ****
                                $values = array
                                (
!                                       'id'            => $this->cat_id,
!                                       'parent'        => $cat_parent,
!                                       'descr'         => $cat_description,
!                                       'name'          => $cat_name,
!                                       'access'        => 'public'
                                );
  
--- 342,351 ----
                                $values = array
                                (
!                                       'id'                    => 
$this->cat_id,
!                                       'old_parent'    => $old_parent,
!                                       'parent'                => $cat_parent,
!                                       'descr'                 => 
$cat_description,
!                                       'name'                  => $cat_name,
!                                       'access'                => 'public'
                                );
  
***************
*** 357,361 ****
                                else
                                {
!                                       $this->bo->save_cat($values);
                                        
$this->template->set_var('message',lang('Category x has been updated 
!',$cat_name));
                                }
--- 357,361 ----
                                else
                                {
!                                       $this->cat_id = 
$this->bo->save_cat($values);
                                        
$this->template->set_var('message',lang('Category x has been updated 
!',$cat_name));
                                }
***************
*** 372,375 ****
--- 372,379 ----
                                
$this->template->set_var('title_categories',lang('Edit global category'));
                        }
+ 
+                       $hidden_vars = '<input type="hidden" name="cat_id" 
value="' . $this->cat_id . '">' . "\n"
+                                                       . '<input type="hidden" 
name="old_parent" value="' . $cats[0]['parent'] . '">' . "\n";
+                       $this->template->set_var('hidden_vars',$hidden_vars);
  
                        $link_data['menuaction']        = 
'admin.uicategories.edit';