[Fmsystem-commits] [15065] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15065
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15065
Author:   sigurdne
Date:     2016-05-13 12:05:59 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.bocommon.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.bocommon.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.bocommon.inc.php       
2016-05-13 12:05:56 UTC (rev 15064)
+++ branches/dev-syncromind-2/property/inc/class.bocommon.inc.php       
2016-05-13 12:05:59 UTC (rev 15065)
@@ -2431,14 +2431,16 @@
                        $query = phpgw::get_var('query');
 
                        $sogeneric = CreateObject('property.sogeneric', 
'eco_service');
-                       $values = $sogeneric->read(array('query' => $query));
 
+                       $filter = array('active' => 1);
+                       $values = $sogeneric->read(array('filter' => 
$filter,'query' => $query));
+
                        return array('ResultSet' => array('Result' => $values));
                }
 
                public function get_eco_service_name( $id )
                {
-                       $ret = '';
+                       $ret = $id;
                        if($id = (int)$id)
                        {
                                $sogeneric = CreateObject('property.sogeneric', 
'eco_service');
@@ -2496,7 +2498,8 @@
                        $query = phpgw::get_var('query');
 
                        $sogeneric = CreateObject('property.sogeneric', 
'external_project');
-                       $values = $sogeneric->read(array('query' => $query));
+                       $filter = array('active' => 1);
+                       $values = $sogeneric->read(array('filter' => 
$filter,'query' => $query));
 
                        foreach ($values as &$value)
                        {
@@ -2508,7 +2511,7 @@
 
                public function get_external_project_name( $id )
                {
-                       $ret = '';
+                       $ret = $id;
                        if($id)
                        {
                                $sogeneric = CreateObject('property.sogeneric', 
'external_project');