[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.19,1.20 class.uideliveries.inc.php,1.22,1.23 class.uiprojecthours.inc.php,1.25,1.26 class.uiprojects.inc.php,1.48,1.49 class.uistatistics.inc.php,1.11,1.12

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.uibilling.inc.php class.uideliveries.inc.php 
        class.uiprojecthours.inc.php class.uiprojects.inc.php 
        class.uistatistics.inc.php 
Log Message:
update search plus filter

Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uibilling.inc.php     15 Jan 2002 03:17:12 -0000      1.19
--- class.uibilling.inc.php     1 Feb 2002 04:24:26 -0000       1.20
***************
*** 237,243 ****
                        $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,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 
--------------------------
--- 237,243 ----
                        $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 
--------------------------

Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uideliveries.inc.php  15 Jan 2002 03:17:12 -0000      1.22
--- class.uideliveries.inc.php  1 Feb 2002 04:24:26 -0000       1.23
***************
*** 222,228 ****
                        $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,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 
--------------------------
--- 222,228 ----
                        $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 
--------------------------

Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uiprojecthours.inc.php        17 Jan 2002 20:26:35 -0000      1.25
--- class.uiprojecthours.inc.php        1 Feb 2002 04:24:26 -0000       1.26
***************
*** 203,209 ****
                        
$this->t->set_var('project_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
                        
$this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       
$this->t->set_var('filter_list',$this->nextmatchs->filter(1));
                        
$this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       
$this->t->set_var('search_list',$this->nextmatchs->search(1));
                        
$this->t->set_var('state_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
--- 203,209 ----
                        
$this->t->set_var('project_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
                        
$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)));
                        
$this->t->set_var('state_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
  

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** class.uiprojects.inc.php    15 Jan 2002 03:17:12 -0000      1.48
--- class.uiprojects.inc.php    1 Feb 2002 04:24:26 -0000       1.49
***************
*** 231,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,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 
--------------------------
--- 231,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 
--------------------------

Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uistatistics.inc.php  15 Jan 2002 03:17:13 -0000      1.11
--- class.uistatistics.inc.php  1 Feb 2002 04:24:26 -0000       1.12
***************
*** 218,224 ****
                        $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,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 
--------------------------
--- 218,224 ----
                        $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 
--------------------------