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

DataObjects/Core_enum.php
---

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 0cd7c183..38c0b9e7 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -160,14 +160,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
         if(empty($req['etype'])){
             if (empty($req['name'])) {
-                $roo->jerr('name missing for new top level etype');
+                $roo->jerr('name or etype missing');
             }
             if($x->get('name', $req['name'])){
                 $roo->jerr('name already exists');
             }
         } else if (!empty($req['_bulk_names'])) {
             
-            
             $lines = explode("\n", $req['_bulk_names']);
             foreach($lines as $l) {
                 $l = trim($l);
@@ -177,10 +176,12 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 $bits = explode(',', $l);
                 $x = $this->factory($tn);
                 $rr = array(
-                    'etype');
-                $rr['name'] = array_shift($bits);
+                    'etype' => $req['etype'],
+                    'name' => array_shift($bits)
+                );
+                
                 $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
-                $rr[']
+                
                 
                 
             }