[Phpgroupware-cvs] CVS: preferences/inc class.bocategories.inc.php,1.2,1.2.2.1 class.uicategories.inc.php,1.2,1.2.2.1

[Bettina gille <address@hidden>]

Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv21506/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocategories.inc.php class.uicategories.inc.php 
Log Message:
fixed wrong selection of global_cats plus check for name

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.bocategories.inc.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** class.bocategories.inc.php  12 Jan 2002 18:28:42 -0000      1.2
--- class.bocategories.inc.php  13 Jan 2002 23:57:06 -0000      1.2.2.1
***************
*** 69,75 ****
                }
  
!               function get_list()
                {
!                       return 
$this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order,True);
                }
  
--- 69,75 ----
                }
  
!               function get_list($global_cats)
                {
!                       return 
$this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order,$global_cats);
                }
  
***************
*** 102,108 ****
                }
  
!               function formatted_list($data)
                {
!                       return 
$this->cats->formated_list($data['select'],$data['all'],$data['cat_parent']);
                }
  
--- 102,108 ----
                }
  
!               function formatted_list($format,$type,$cat_parent,$global_cats)
                {
!                       return 
$this->cats->formated_list($format,$type,$cat_parent,$global_cats);
                }
  
***************
*** 125,129 ****
                        else
                        {
!                               if (!$values['cat_parent'])
                                {
                                        $exists = $this->exists(array
--- 125,129 ----
                        else
                        {
!                               if (!$values['parent'])
                                {
                                        $exists = $this->exists(array
***************
*** 146,150 ****
                                if ($exists == True)
                                {
!                                       $error[] = lang('That name has been 
used already');
                                }
                        }
--- 146,150 ----
                                if ($exists == True)
                                {
!                                       $error[] = lang('This name has been 
used already');
                                }
                        }

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** class.uicategories.inc.php  12 Jan 2002 18:28:42 -0000      1.2
--- class.uicategories.inc.php  13 Jan 2002 23:57:06 -0000      1.2.2.1
***************
*** 107,112 ****
                        }
  
                        $this->bo->cats->app_name = $cats_app;
!                       $cats = $this->bo->get_list();
  
  //--------------------------------- nextmatch 
--------------------------------------------
--- 107,117 ----
                        }
  
+                       if (!$global_cats)
+                       {
+                               $global_cats = False;
+                       }
+ 
                        $this->bo->cats->app_name = $cats_app;
!                       $cats = $this->bo->get_list($global_cats);
  
  //--------------------------------- nextmatch 
--------------------------------------------
***************
*** 276,280 ****
                                $values = array
                                (
-                                       'id'            => '',
                                        'parent'        => $cat_parent,
                                        'descr'         => $cat_description,
--- 281,284 ----