DataObjects/Core_company.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 56a14a6..1d8ada5 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -27,6 +27,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         if (!empty($q['query']['empty_etype'])) {
             $this->whereAdd("core_enum.etype = ''");
         }
+        
+        if(!empty($q['query']['name'])){
+            $search_name = $this->escape($q['query']['name']);
+            $this->whereAdd("
+                core_enum.name LIKE '%$search_name%'
+            ");
+        }
 
         // this should be handled by roo... using '!name[0]' ....
         if(!empty($q['!name'])){
@@ -140,7 +147,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $this->merge($request['_merge_id'], $roo);
         }
 
-        $tn = $this->tableName();echo $tn; die;
+        $tn = $this->tableName();
         $x = $this->factory($tn);
         // check if record exists?
         if(isset($request['etype']) &&   !($old->etype == $request['etype'] && $old->name == $request['name'])){
@@ -395,7 +402,8 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     function merge($merge_to, $roo)
     {
         $affects  = array();
-
+        $tn = $this->tableName();
+        $x = $this->factory($tn);
         $all_links = $x->databaseLinks();
 
         foreach($all_links as $tbl => $links) {