From: Alan Knowles <alan@roojs.com>
Date: Mon, 25 Jan 2016 05:19:34 +0000 (+0800)
Subject: DataObjects/Core_enum.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=ce98b4daf7e1bdaf2898c75031b5e7163f95d4da

DataObjects/Core_enum.php
---

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 062041f0..0cd7c183 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -159,10 +159,34 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $x = $this->factory($tn);
         
         if(empty($req['etype'])){
+            if (empty($req['name'])) {
+                $roo->jerr('name missing for new top level etype');
+            }
             if($x->get('name', $req['name'])){
                 $roo->jerr('name already exists');
             }
-        }else{
+        } else if (!empty($req['_bulk_names'])) {
+            
+            
+            $lines = explode("\n", $req['_bulk_names']);
+            foreach($lines as $l) {
+                $l = trim($l);
+                if (!strlen($l)) {
+                    continue;
+                }
+                $bits = explode(',', $l);
+                $x = $this->factory($tn);
+                $rr = array(
+                    'etype');
+                $rr['name'] = array_shift($bits);
+                $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
+                $rr[']
+                
+                
+            }
+            
+            
+        } else {
             $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
             $x->find(true);
             if($x->count() > 0){