[Phpgroupware-cvs] CVS: projects/inc class.uiprojects.inc.php,1.47.2.2,1.47.2.3 hook_admin.inc.php,1.6,1.6.2.1

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv28264/inc

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

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.2
retrieving revision 1.47.2.3
diff -C2 -r1.47.2.2 -r1.47.2.3
*** class.uiprojects.inc.php    1 Feb 2002 02:17:40 -0000       1.47.2.2
--- class.uiprojects.inc.php    13 Mar 2002 21:32:20 -0000      1.47.2.3
***************
*** 230,241 ****
  
                        $this->t->set_var('action_list',$action_list);
- 
-                       $GLOBALS['filter']      = $this->filter;
-                       $GLOBALS['query']       = $this->query;
- 
                        
$this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,1));
                        
$this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       
$this->t->set_var('search_list',$this->nextmatchs->search(1));
  
  // ---------------- list header variable template-declarations 
--------------------------
--- 230,237 ----
  
                        $this->t->set_var('action_list',$action_list);
                        
$this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,array('yours' => 
1,'filter' => $this->filter)));
                        
$this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       
$this->t->set_var('search_list',$this->nextmatchs->search(array('search_obj' => 
1,'query' => $this->query)));
  
  // ---------------- list header variable template-declarations 
--------------------------
***************
*** 372,376 ****
                                }
  
!                               if ($cat[0]['app_name'] == 'phpgw' || 
!$this->cat_id)
                                {
                                        $showadd = True;
--- 368,372 ----
                                }
  
!                               if ($cat[0]['app_name'] == 'phpgw' || 
$cat[0]['owner'] == '-1' || !$this->cat_id)
                                {
                                        $showadd = True;
***************
*** 1092,1096 ****
  // -------------------------------- end Add form declaration 
------------------------------
  
- //                    $GLOBALS['phpgw']->common->phpgw_footer();
                }
  
--- 1088,1091 ----

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_admin.inc.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** hook_admin.inc.php  9 Jan 2002 01:06:53 -0000       1.6
--- hook_admin.inc.php  13 Mar 2002 21:32:20 -0000      1.6.2.1
***************
*** 13,24 ****
        {
  // Only Modify the $file and $title variables.....
-               $title = $appname;
                $file = Array
                (
                        'Administration'        => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pad'),
!                       'Accountancy'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pbo')
                );
  //Do not modify below this line
!               display_section($appname,$title,$file);
        }
  ?>
--- 13,24 ----
        {
  // Only Modify the $file and $title variables.....
                $file = Array
                (
                        'Administration'        => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pad'),
!                       'Accountancy'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pbo'),
!                       'Global Categories'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname)
                );
  //Do not modify below this line
!               display_section($appname,$appname,$file);
        }
  ?>