[Fmsystem-commits] [15686] property: filter inactive items

[sigurdne]

Revision: 15686
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15686
Author:   sigurdne
Date:     2016-09-16 08:51:07 +0000 (Fri, 16 Sep 2016)
Log Message:
-----------
property: filter inactive items

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.soentity.inc.php

Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php     
2016-09-16 07:57:33 UTC (rev 15685)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php     
2016-09-16 08:51:07 UTC (rev 15686)
@@ -776,20 +776,18 @@
                        }
 
                        $sql_custom_field = '';
+                       /*
+                        * Filter inactive
+                        */
+                       static $cache_attribute_status = array();
+                       if(!isset($cache_attribute_status[$location_id]))
+                       {
+                               $filters = array("column_name" => "status");
+                               $cache_attribute_status[$location_id] = 
$GLOBALS['phpgw']->custom_fields->find2($location_id, 0, '', 'ASC', '', true, 
true,$filters);
+                       }
 
-                       if($check_for_control && !$control_registered)
+                       if(!phpgw::get_var('status', 'int'))
                        {
-
-                               /*
-                                * Filter inactive
-                                */
-                               static $cache_attribute_status = array();
-                               
if(!isset($cache_attribute_status[$location_id]))
-                               {
-                                       $filters = array("column_name" => 
"status");
-                                       $cache_attribute_status[$location_id] = 
$GLOBALS['phpgw']->custom_fields->find2($location_id, 0, '', 'ASC', '', true, 
true,$filters);
-                               }
-
                                
if(!empty($cache_attribute_status[$location_id]))
                                {
                                        foreach 
($cache_attribute_status[$location_id] as $attibute_id => $attibute)
@@ -807,7 +805,11 @@
                                                }
                                        }
                                }
+                       }
 
+                       if($check_for_control && !$control_registered)
+                       {
+
                                $sql .= "{$this->left_join} {$join_control}";
 
                                $sql_custom_field .= ',count(control_id) AS 
has_control';