DataObjects/Core_notify_recur.php

[Pman.Core] / DataObjects / Companies.php

diff --git a/DataObjects/Companies.php b/DataObjects/Companies.php
index 64a71d4..b0df0bf 100644 (file)
--- a/DataObjects/Companies.php
+++ b/DataObjects/Companies.php
@@ -40,6 +40,9 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
     
     function applyFilters($q, $au)
     {
+       
+        $this->selectAdd("i18n_translate('c' , Companies.country, 'en') as country_display_name ");
+      
         $tn = $this->tableName();
         //DB_DataObject::debugLevel(1);
         $x = DB_DataObject::factory('Companies');
@@ -99,7 +102,18 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
                 ) as comptype_display_name
         ");
         
-         
+        if(!empty($q['search']['name'])){
+            $s = $this->escape($q['search']['name']);
+            $this->whereAdd("
+                {$tn}.name LIKE '%$s%'
+            ");
+        }
+          if(!empty($q['search']['name_starts'])){
+            $s = $this->escape($q['search']['name_starts']);
+            $this->whereAdd("
+                {$tn}.name LIKE '$s%'
+            ");
+        }
     }
     
     function toEventString() {
@@ -323,7 +337,7 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
         $e = DB_DataObject::Factory('core_enum')->lookupObject('COMPTYPE', $this->comptype);
         
         $ret['comptype_display'] = $ret['comptype'];
-        if ($e->find(true) && !empty($e->name_display)) {
+        if ($e   && !empty($e->name_display)) {
             $ret['comptype_display'] = $e->name_display;
         }
         
@@ -397,7 +411,7 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
         $companies->insert();
         $companies->onInsert(array(), $roo);
     }
-    function    lookupOwner()
+    function lookupOwner()
     {
         $enum = DB_DataObject::Factory('core_enum')->lookup('COMPTYPE', 'OWNER'  );
         $companies = DB_DataObject::factory('companies');