X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_project.php;h=92c202ebee15fbfc64b2614845b0966b0cc3ccd7;hb=586e4eb470252d837ba18b67e4c3c1702131fd1d;hp=e25dc1b04ef90212b9a144fca6244e809d2ed7f1;hpb=358214a68f6cc041045cf4b5341e30d47aa043fd;p=Pman.Core

diff --git a/DataObjects/Core_project.php b/DataObjects/Core_project.php
index e25dc1b0..92c202eb 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();
@@ -57,7 +57,7 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject
             
         }
         $ret = array();
-        $p =  DB_DataObject::factory('Person');
+        $p =  DB_DataObject::factory('core_person');
         $p->whereAdd('id IN ('. implode(',', $pmids) .')');
         $p->find();
         while ($p->fetch()) {
@@ -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'];
@@ -151,7 +158,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');
              
         }
@@ -168,7 +175,7 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject
         
     }
  
-    function onInsert()
+    function onInsert($request,$roo)
     {
         $oo = clone($this);
         if (empty($this->code)) {
@@ -179,7 +186,7 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject
         }
     }
     
-    function onUpdate($old)
+    function onUpdate($old, $request, $roo)
     {
         $oo = clone($this);
         if (empty($this->code)) {