[Phpgroupware-cvs] CVS: notes/inc class.ui.inc.php,1.5.2.4,1.5.2.5 hook_admin.inc.php,1.1.2.1,1.1.2.2

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/notes/inc
In directory subversions:/tmp/cvs-serv28310/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.ui.inc.php hook_admin.inc.php 
Log Message:
fixed cats to work in global cats apps part

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.ui.inc.php,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -C2 -r1.5.2.4 -r1.5.2.5
*** class.ui.inc.php    21 Feb 2002 03:07:46 -0000      1.5.2.4
--- class.ui.inc.php    13 Mar 2002 21:32:51 -0000      1.5.2.5
***************
*** 115,119 ****
  // --------------------------------- nextmatch ---------------------------
  
-                       $GLOBALS['query']  = $this->search;
                        $link_data = array
                        (
--- 115,118 ----
***************
*** 126,130 ****
                        $this->t->set_var('right',$right);
  
-                       $this->t->set_var('search',$this->search);
                        
$this->t->set_var('search_message',$this->nextmatchs->show_hits($this->bo->total_records,$this->start));
  
--- 125,128 ----
***************
*** 205,209 ****
                        $link_data['cat_id']            = $this->cat_id;
  
!                       if ($cat[0]['app_name'] == 'phpgw' || !$this->cat_id)
                        {
                                $this->t->set_var('add','<form method="POST" 
action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)
--- 203,207 ----
                        $link_data['cat_id']            = $this->cat_id;
  
!                       if ($cat[0]['app_name'] == 'phpgw' || $cat[0]['owner'] 
== '-1' || !$this->cat_id)
                        {
                                $this->t->set_var('add','<form method="POST" 
action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/hook_admin.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** hook_admin.inc.php  26 Jan 2002 00:34:25 -0000      1.1.2.1
--- hook_admin.inc.php  13 Mar 2002 21:32:51 -0000      1.1.2.2
***************
*** 10,22 ****
        *  option) any later version.                                           
   *
        
\**************************************************************************/
- 
        // $Id$
        // $Source$
  
!       $values = array
!       (
!               'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=notes')
!       );
  
!       display_section('notes','Notes',$values);
  ?>
--- 10,23 ----
        *  option) any later version.                                           
   *
        
\**************************************************************************/
        // $Id$
        // $Source$
  
!       {
!               $values = array
!               (
!                       'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname)
!               );
  
!               display_section($appname,$appname,$values);
!       }
  ?>