X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_project.php;h=de9db550e3127602a4d2919ee887d9fd94fe437d;hb=f5aa5d161bc0428db89f56aa318dbf03ddff22bc;hp=d1b441e127f69db6be32bd1509b1791d94cdfcc5;hpb=fd929b0d560e0711bc81f64cbb71fd2cd2aab71a;p=Pman.Core diff --git a/DataObjects/Core_project.php b/DataObjects/Core_project.php index d1b441e1..de9db550 100644 --- a/DataObjects/Core_project.php +++ b/DataObjects/Core_project.php @@ -33,7 +33,7 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject ###END_AUTOCODE function getProjectManagers() { - $c = DB_DataObject::factory('Companies'); + $c = DB_DataObject::factory('core_company'); $c->isOwner = 1; if (!$c->find(true)) { return array(); @@ -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'); }