X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_project.php;h=d6b6bde250eecc97da6fd0e833eb929afbf22855;hb=c14fed651c0fb9a87e4abb3bb8af83871baa899a;hp=b899ef3fc1e011162d27846ff9081c117666adbf;hpb=83f98205885cf289c21ba9fb63a28e0226b00cd6;p=Pman.Core diff --git a/DataObjects/Core_project.php b/DataObjects/Core_project.php index b899ef3f..d6b6bde2 100644 --- a/DataObjects/Core_project.php +++ b/DataObjects/Core_project.php @@ -87,13 +87,18 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject * */ - function applyFilters($q, $au) + function applyFilters($q, $au, $roo) { $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'])) { @@ -109,7 +114,9 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject } } - if (empty($q['query']['project_filter']) || $q['query']['project_filter'] != 'ALL') { + if (empty($q['_is_update_request']) && + + (empty($q['query']['project_filter']) || $q['query']['project_filter'] != 'ALL')) { $pf = empty($q['query']['project_filter']) ? 'P,N,U' : $q['query']['project_filter'];