[Fmsystem-commits] [7110] property: session filters

[Sigurd Nes]

Revision: 7110
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7110
Author:   sigurdne
Date:     2011-03-11 12:37:26 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
property: session filters

Modified Paths:
--------------
    trunk/property/inc/class.boproject.inc.php
    trunk/property/inc/class.uiproject.inc.php

Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php  2011-03-11 12:02:40 UTC (rev 
7109)
+++ trunk/property/inc/class.boproject.inc.php  2011-03-11 12:37:26 UTC (rev 
7110)
@@ -79,16 +79,47 @@
                        $criteria_id                    = 
phpgw::get_var('criteria_id', 'int');
 
                        $this->start                    = $start ? $start : 0;
-                       $this->query                    = isset($query) ? 
$query : $this->query;
-                       $this->sort                             = isset($sort) 
&& $sort ? $sort : '';
-                       $this->order                    = isset($order) && 
$order ? $order : '';
-                       $this->filter                   = isset($filter) && 
$filter ? $filter : '';
-                       $this->cat_id                   = isset($cat_id) && 
$cat_id ? $cat_id : '';
-                       $this->status_id                = isset($status_id) && 
$status_id ? $status_id : '';
-                       $this->user_id                  = isset($user_id) && 
$user_id ? $user_id : '';
-                       $this->wo_hour_cat_id   = isset($wo_hour_cat_id) && 
$wo_hour_cat_id ? $wo_hour_cat_id : '';
-                       $this->district_id              = isset($district_id) 
&& $district_id ? $district_id : '';
-                       $this->criteria_id              = isset($criteria_id) 
&& $criteria_id ? $criteria_id : '';
+
+                       if(isset($_POST['query']) || isset($_GET['query']))
+                       {
+                               $this->query = $query;
+                       }
+                       if(isset($_POST['sort']) || isset($_GET['sort']))
+                       {
+                               $this->sort = $sort;
+                       }
+                       if(isset($_POST['order']) || isset($_GET['order']))
+                       {
+                               $this->order = $order;
+                       }
+                       if(isset($_POST['filter']) || isset($_GET['filter']))
+                       {
+                               $this->filter = $filter;
+                       }
+                       if(isset($_POST['cat_id']) || isset($_GET['cat_id']))
+                       {
+                               $this->cat_id = $cat_id;
+                       }
+                       if(isset($_POST['status_id']) || 
isset($_GET['status_id']))
+                       {
+                               $this->status_id = $status_id;
+                       }
+                       if(isset($_POST['user_id']) || isset($_GET['user_id']))
+                       {
+                               $this->user_id = $user_id;
+                       }
+                       if(isset($_POST['wo_hour_cat_id']) || 
isset($_GET['wo_hour_cat_id']))
+                       {
+                               $this->wo_hour_cat_id = $wo_hour_cat_id;
+                       }
+                       if(isset($_POST['district_id']) || 
isset($_GET['district_id']))
+                       {
+                               $this->district_id = $district_id;
+                       }
+                       if(isset($_POST['criteria_id']) || 
isset($_GET['criteria_id']))
+                       {
+                               $this->criteria_id = $criteria_id;
+                       }
                }
 
                function save_sessiondata($data)

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2011-03-11 12:02:40 UTC (rev 
7109)
+++ trunk/property/inc/class.uiproject.inc.php  2011-03-11 12:37:26 UTC (rev 
7110)
@@ -192,6 +192,7 @@
                                $this->district_id              = 
$default_district;
                        }
 
+                       $this->save_sessiondata();
                        $datatable = array();
 
                        if( phpgw::get_var('phpgw_return_as') != 'json' )
@@ -200,19 +201,19 @@
                                $datatable['config']['base_url'] = 
$GLOBALS['phpgw']->link('/index.php', array
                                        (
                                                'menuaction'                    
=> 'property.uiproject.index',
-                                               'query'                         
=> $this->query,
-                                               'district_id'           => 
$this->district_id,
-                                               'part_of_town_id'       => 
$this->part_of_town_id,
+                               //              'query'                         
=> $this->query,
+                               //              'district_id'           => 
$this->district_id,
+                               //              'part_of_town_id'       => 
$this->part_of_town_id,
                                                'lookup'                        
=> $lookup,
-                                               'cat_id'                        
=> $this->cat_id,
-                                               'status_id'                     
=> $this->status_id,
-                                               'wo_hour_cat_id'                
=> $this->wo_hour_cat_id,
-                                               'user_id'                       
        => $this->user_id,
-                                               'criteria_id'                   
=> $this->criteria_id
+                               //              'cat_id'                        
=> $this->cat_id,
+                               //              'status_id'                     
=> $this->status_id,
+                               //              'wo_hour_cat_id'                
=> $this->wo_hour_cat_id,
+                               //              'user_id'                       
        => $this->user_id,
+                               //              'criteria_id'                   
=> $this->criteria_id
                                        ));
 
                                $datatable['config']['base_java_url'] = 
"menuaction:'property.uiproject.index',"
-                                       ."query:'{$this->query}',"
+                               //      ."query:'{$this->query}',"
                                        ."district_id: '{$this->district_id}',"
                                        
."part_of_town_id:'{$this->part_of_town_id}',"
                                        ."lookup:'{$lookup}',"
@@ -877,7 +878,6 @@
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('property') . ' - ' . $appname . ': ' . $function_msg;
 
                        $GLOBALS['phpgw']->js->validate_file( 'yahoo', 
'project.index', 'property' );
-                       $this->save_sessiondata();
                }
 
                function date_search()