[Fmsystem-commits] [16612] property: fix status-filter

[sigurdne]

Revision: 16612
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16612
Author:   sigurdne
Date:     2017-04-22 13:08:53 -0400 (Sat, 22 Apr 2017)
Log Message:
-----------
property: fix status-filter

Modified Paths:
--------------
    trunk/property/inc/class.soentity.inc.php

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2017-04-21 14:40:27 UTC (rev 
16611)
+++ trunk/property/inc/class.soentity.inc.php   2017-04-22 17:08:53 UTC (rev 
16612)
@@ -691,11 +691,11 @@
                                        {
                                                if($_int_query)
                                                {
-                                                       $_querymethod[] = "( 
{$entity_table}.location_code {$this->like} '%{$query}%' OR {$entity_table}.id 
= {$_int_query} OR address {$this->like} '%{$query}%')";                    
+                                                       $_querymethod[] = "( 
{$entity_table}.location_code {$this->like} '%{$query}%' OR {$entity_table}.id 
= {$_int_query} OR address {$this->like} '%{$query}%')";
                                                }
                                                else
                                                {
-                                                       $_querymethod[] = "( 
{$entity_table}.location_code {$this->like} '%{$query}%' OR address 
{$this->like} '%{$query}%')";                                                   
                       
+                                                       $_querymethod[] = "( 
{$entity_table}.location_code {$this->like} '%{$query}%' OR address 
{$this->like} '%{$query}%')";
                                                }
 //                                             $where= 'OR';
                                        }
@@ -924,6 +924,10 @@
                                        $querymethod .= " AND 
{$_querymethod_status}";
                                }
                        }
+                       else
+                       {
+                               $querymethod = " $where {$_querymethod_status}";
+                       }
 
 //                     $filtermethod .= "AND xmlexists('//location_code[text() 
= ''5002-02'']' PASSING BY REF xml_representation)";