X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=f6092018dc51aee6ae500049b65c7db9def71e21;hb=586e4eb470252d837ba18b67e4c3c1702131fd1d;hp=8aaf03ec4edf4bb87bbbf35483e787ac40d5a61f;hpb=4f1429a4c5b91b490f2e73f0a2d090a097ea1d73;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 8aaf03ec..f6092018 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -27,6 +27,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         if (!empty($q['query']['empty_etype'])) {
             $this->whereAdd("core_enum.etype = ''");
         }
+        
 
         // this should be handled by roo... using '!name[0]' ....
         if(!empty($q['!name'])){
@@ -136,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();
@@ -156,8 +171,9 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     {
         $tn = $this->tableName();
         $x = $this->factory($tn);
-        
+
         if(empty($req['etype']) || !strlen(trim($req['etype'])) ){
+
             if (empty($req['name']) || !strlen(trim($req['name']))) {
                 $roo->jerr('name or etype missing');
             }
@@ -166,7 +182,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 $roo->jerr("name already exists - '{$req['name']}'"  );
             }
         } else if (!empty($req['_bulk_names'])) {
-            
+
             $lines = explode("\n", $req['_bulk_names']);
             foreach($lines as $l) {
                 $l = trim($l);
@@ -296,6 +312,15 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         return $x->fetchAll($fetchArg1, $fetchArg2, $fetchArg3);
     }
 
+    function fetchAllByTypeOrderDisplay($etype, $fetchArg1=false, $fetchArg2=false, $fetchArg3=false)
+    {
+        $x = DB_DataObject::factory('core_enum');
+        $x->etype = $etype;
+        $x->active = 1;
+        $x->orderBy('display_name ASC');
+        return $x->fetchAll($fetchArg1, $fetchArg2, $fetchArg3);
+    }
+    
     function lookupObject($etype,$name, $create= false)
     {
 
@@ -343,6 +368,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');
 
@@ -429,7 +455,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
 
         $this->delete();
 
-        $roo->jok('Merged');
+        
 
     }