X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=3140cf7a4ea22a47c6e2d3ae1c567becbeac7952;hb=39538dd1c71297fb385a26c1aead204229558d44;hp=1d8ada5deb8896079ac97baf69b662c0ce056dc9;hpb=bfe81d43844c80cbf9306113786a877ceccca68b;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 1d8ada5d..3140cf7a 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -28,12 +28,6 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $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'])){
@@ -143,8 +137,22 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
 
     function beforeUpdate($old, $request,$roo)
     {
+
+        /* multiple id merge */
         if(!empty($request['_merge_id'])){
-            $this->merge($request['_merge_id'], $roo);
+            if(!empty($request['_ids'])){
+                //DB_DataObject::DebugLevel(1);
+                $ce = DB_DataObject::factory('core_enum');
+                $ce->whereAddIn("id", explode(",", $request['_ids']), "int");
+
+                foreach($ce->fetchAll() as $mergeItem){
+
+                    $mergeItem->merge($request['_merge_id'], $roo);
+                }
+            } else {
+                $this->merge($request['_merge_id'], $roo);
+            }
+            $roo->jok('Merged'); 
         }
 
         $tn = $this->tableName();
@@ -351,6 +359,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 $seq_id = $t->seqid+1;
             }
         }
+        
         foreach($data as $row) {
             $t = DB_DAtaObject::Factory('core_enum');
 
@@ -437,7 +446,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
 
         $this->delete();
 
-        $roo->jok('Merged');
+        
 
     }