DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Companies.php

diff --git a/DataObjects/Companies.php b/DataObjects/Companies.php
index a36d764..0b5d8ab 100644 (file)
--- a/DataObjects/Companies.php
+++ b/DataObjects/Companies.php
@@ -78,12 +78,6 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
             
         }
         
-        // search company name and description
-        if (!empty($q['_search'])) {
-            $s = $this->escape($q['_search']);
-            $this->whereAdd("Companies.name like '%$s%' OR Companies.description like '%$s%' ");
-        }
-        
         // depricated - should be moved to module specific (texon afair)
         
          if (!empty($q['query']['province'])) {
@@ -294,6 +288,22 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
         return $fm->toHTML($size, $base);
     }
     
+    function toRooSingleArray($authUser, $request)
+    {
+        $ret = $this->toArray();
+       // DB_DataObject::debugLevel(1);
+        // get the comptype display
+        $e = DB_DataObject::Factory('core_enum');
+        $e->etype = 'COMPTYPE';
+        $e->name = $this->comptype;
+        $ret['comptype_display'] = $ret['comptype'];
+        if ($e->find(true) && !empty($e->name_display)) {
+            $ret['comptype_display'] = $e->name_display;
+        }
+        
+        
+        return $ret;
+    }
     
     
 }