[Fmsystem-commits] [15786] more on logistic

[sigurdne]

Revision: 15786
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15786
Author:   sigurdne
Date:     2016-10-03 08:18:29 +0000 (Mon, 03 Oct 2016)
Log Message:
-----------
more on logistic

Modified Paths:
--------------
    trunk/logistic/inc/class.uiproject.inc.php
    trunk/logistic/inc/class.uiresource_type_requirement.inc.php

Modified: trunk/logistic/inc/class.uiproject.inc.php
===================================================================
--- trunk/logistic/inc/class.uiproject.inc.php  2016-10-03 08:02:24 UTC (rev 
15785)
+++ trunk/logistic/inc/class.uiproject.inc.php  2016-10-03 08:18:29 UTC (rev 
15786)
@@ -116,6 +116,7 @@
 
                        //Retrieve the type of query and perform type specific 
logic
                        $query_type = phpgw::get_var('type');
+                       $filters = array();
                        //var_dump($query_type);
                        switch ($query_type)
                        {
@@ -409,7 +410,7 @@
                        {
                                if ($project_type_id && 
is_numeric($project_type_id))
                                {
-                                       $objects = $this->so->get(null, null, 
null, null, null, 'project_type', array(
+                                       $objects = 
$this->so->get(0,0,'',false,'', 'project_type', array(
                                                'id' => $project_type_id));
                                        if (count($objects) > 0)
                                        {
@@ -432,7 +433,7 @@
                        $project_type_id = phpgw::get_var('id');
                        if ($project_type_id && is_numeric($project_type_id))
                        {
-                               $objects = $this->so->get(null, null, null, 
null, null, 'project_type', array(
+                               $objects = $this->so->get(0,0,'',false,'', 
'project_type', array(
                                        'id' => $project_type_id));
                                if (count($objects) > 0)
                                {
@@ -486,7 +487,7 @@
 
                        if ($project_type_id && is_numeric($project_type_id))
                        {
-                               $objects = $this->so->get(null, null, null, 
null, null, 'project_type', array(
+                               $objects = $this->so->get(0,0,'',false,'', 
'project_type', array(
                                        'id' => $project_type_id));
                                if (count($objects) > 0)
                                {

Modified: trunk/logistic/inc/class.uiresource_type_requirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uiresource_type_requirement.inc.php        
2016-10-03 08:02:24 UTC (rev 15785)
+++ trunk/logistic/inc/class.uiresource_type_requirement.inc.php        
2016-10-03 08:18:29 UTC (rev 15786)
@@ -270,7 +270,7 @@
                        $project_type_id = phpgw::get_var('project_type_id');
                        if ($location_id)
                        {
-                               $req_types = $this->so->get(null, null, null, 
null, null, null, array('location_id' => $location_id,
+                               $req_types = $this->so->get(0,0,'',false,'','', 
array('location_id' => $location_id,
                                        'project_type_id' => $project_type_id));
                                if (count($req_types) > 0)
                                {
@@ -293,7 +293,7 @@
                                $cust_attr_ids = phpgw::get_var('attributes');
                                $selected_attributes[] = array();
 
-                               $req_type_array = $this->so->get(null, null, 
null, null, null, null, array('location_id' => $location_id,
+                               $req_type_array = 
$this->so->get(0,0,'',false,'','', array('location_id' => $location_id,
                                        'project_type_id' => $project_type_id));
                                $req_types_for_delete = array();
                                if (count($req_type_array) > 0)
@@ -446,7 +446,7 @@
 
                        if ($location_id && is_numeric($location_id))
                        {
-                               $req_types = $this->so->get(null, null, null, 
null, null, null, array('location_id' => $location_id,
+                               $req_types = $this->so->get(0,0,'',false,'','', 
array('location_id' => $location_id,
                                        'project_type_id' => $project_type_id));
                                $loc_arr = 
$GLOBALS['phpgw']->locations->get_name($location_id);
                                $entity_arr = explode('.', 
$loc_arr['location']);
@@ -469,7 +469,7 @@
                                        }
                                }
 
-                               $objects = $this->so_project->get(null, null, 
null, null, null, 'project_type', array(
+                               $objects = 
$this->so_project->get(0,0,'',false,'', 'project_type', array(
                                        'id' => $project_type_id));
                                if (count($objects) > 0)
                                {