X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_project.php;h=de9db550e3127602a4d2919ee887d9fd94fe437d;hb=a3aee94f26d113c118d2fc75eea8a75fa99d8098;hp=eed83fbf1e36425e15d08f6ccded883704aa9554;hpb=712600360a28d773c7ced3dfb1409f5e2334c63a;p=Pman.Core diff --git a/DataObjects/Core_project.php b/DataObjects/Core_project.php index eed83fbf..de9db550 100644 --- a/DataObjects/Core_project.php +++ b/DataObjects/Core_project.php @@ -93,7 +93,12 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject $tn = $this->tableName(); if (!empty($q['query']['project_search'])) { $s = $this->escape($q['query']['project_search']); - $this->whereAdd(" ({$tn}.code LIKE '$s%') OR ({$tn}.name LIKE '%$s%')"); + $this->whereAdd(" ({$tn}.code LIKE '$s%') + OR + ({$tn}.name LIKE '%$s%') + OR + join_client_id_id.name LIKE '%$s%' + "); } // types of project to list ... - default is only the open ones... if (!empty($q['query']['project_indaterange'])) { @@ -151,7 +156,7 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject // DB_DataObjecT::debuglevel(1); $this->selectAdd(); $this->selectAdd('distinct(client_id)'); - $this->selectAs(DB_DataObject::factory('Companies'), 'client_id_%s','join_client_id_id'); + $this->selectAs(DB_DataObject::factory('core_company'), 'client_id_%s','join_client_id_id'); $this->groupBy('client_id'); }