[Phpgroupware-cvs] CVS: todo/inc class.bo.inc.php,1.1.2.1,1.1.2.2 class.ui.inc.php,1.2.2.1,1.2.2.2

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/todo/inc
In directory subversions:/tmp/cvs-serv28168/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bo.inc.php class.ui.inc.php 
Log Message:
Maybe cat_id select/save works now



Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/class.bo.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
*** class.bo.inc.php    1 Feb 2002 01:47:50 -0000       1.1.2.1
--- class.bo.inc.php    1 Feb 2002 02:40:14 -0000       1.1.2.2
***************
*** 22,25 ****
--- 22,26 ----
                var $sort;
                var $cat_id;
+               var $debug = False;
  
                var $public_functions = array
***************
*** 52,56 ****
                        $_order   = $GLOBALS['HTTP_POST_VARS']['order']   ? 
$GLOBALS['HTTP_POST_VARS']['order']   : $GLOBALS['HTTP_GET_VARS']['order'];
                        $_filter  = $GLOBALS['HTTP_POST_VARS']['filter']  ? 
$GLOBALS['HTTP_POST_VARS']['filter']  : $GLOBALS['HTTP_GET_VARS']['filter'];
!                       $_cat_id  = $GLOBALS['HTTP_POST_VARS']['cat_id']  ? 
$GLOBALS['HTTP_POST_VARS']['cat_id']  : $GLOBALS['HTTP_GET_VARS']['cat_id'];
  
                        if(!empty($_start) || ($_start == '0') || ($_start == 
0))
--- 53,57 ----
                        $_order   = $GLOBALS['HTTP_POST_VARS']['order']   ? 
$GLOBALS['HTTP_POST_VARS']['order']   : $GLOBALS['HTTP_GET_VARS']['order'];
                        $_filter  = $GLOBALS['HTTP_POST_VARS']['filter']  ? 
$GLOBALS['HTTP_POST_VARS']['filter']  : $GLOBALS['HTTP_GET_VARS']['filter'];
!                       $_fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id'] ? 
$GLOBALS['HTTP_POST_VARS']['fcat_id'] : $GLOBALS['HTTP_GET_VARS']['fcat_id'];
  
                        if(!empty($_start) || ($_start == '0') || ($_start == 
0))
***************
*** 68,76 ****
                        }
  
!                       if(isset($_cat_id) && !empty($_cat_id))
                        {
!                               $this->cat_id = $_cat_id;
                        }
!                       if($_cat_id == '0' || $_cat_id == 0 || $_cat_id == '')
                        {
                                $this->cat_id = 0;
--- 69,78 ----
                        }
  
!                       if(isset($_fcat_id) && !empty($_fcat_id))
                        {
!                               $this->cat_id = $_fcat_id;
                        }
!                       if((isset($GLOBALS['HTTP_POST_VARS']['fcat_id']) || 
isset($GLOBALS['HTTP_GET_VARS']['fcat_id'])) &&
!                               ($_fcat_id == '0' || $_fcat_id == 0 || 
$_fcat_id == ''))
                        {
                                $this->cat_id = 0;
***************
*** 158,161 ****
--- 160,168 ----
                                
$GLOBALS['phpgw']->session->appsession('session_data','todo',$data);
                        }
+                       if($this->debug)
+                       {
+                               echo '<br>Saving: ';
+                               _debug_array($data);
+                       }
                }
  
***************
*** 163,167 ****
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','todo');
! 
                        $this->start    = $data['start'];
                        $this->query    = $data['query'];
--- 170,178 ----
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','todo');
!                       if($this->debug)
!                       {
!                               echo '<br>Read: ';
!                               _debug_array($data);
!                       }
                        $this->start    = $data['start'];
                        $this->query    = $data['query'];

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/class.ui.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** class.ui.inc.php    1 Feb 2002 01:47:50 -0000       1.2.2.1
--- class.ui.inc.php    1 Feb 2002 02:40:14 -0000       1.2.2.2
***************
*** 26,29 ****
--- 26,30 ----
                        'matrix'    => True
                );
+               var $debug = False;
  
                function ui()
***************
*** 123,126 ****
--- 124,128 ----
                        $GLOBALS['query']  = $this->query;
                        $GLOBALS['filter'] = $this->filter;
+                       $GLOBALS['cat_id'] = $this->cat_id;
  
                        $left = 
$this->nextmatchs->left('/index.php',$this->start,$this->bo->total_records,'&menuaction=todo.ui.show_list');