Fix #6032 - change the release index page to plain html

[Pman.Core] / DataObjects / Core_project.php

diff --git a/DataObjects/Core_project.php b/DataObjects/Core_project.php
index d1b441e..d6b6bde 100644 (file)
--- 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();
@@ -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');
              
         }