X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=1a91d40e4dcaf4a58800decc750284fb4ba17565;hb=774760d9348856761ac1ee438a8902e58cd101cf;hp=38c0b9e731bfbbff5e9f603d265c9eb7ec1f64d6;hpb=6e7afd5b0e0e08e31873f9e42faa3951a2c2f2d7;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 38c0b9e7..1a91d40e 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -158,10 +158,12 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $tn = $this->tableName();
         $x = $this->factory($tn);
         
-        if(empty($req['etype'])){
-            if (empty($req['name'])) {
+        if(empty($req['etype']) || !strlen(trim($req['etype'])) ){
+            
+            if (empty($req['name']) || !strlen(trim($req['name']))) {
                 $roo->jerr('name or etype missing');
             }
+            
             if($x->get('name', $req['name'])){
                 $roo->jerr('name already exists');
             }
@@ -174,7 +176,6 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                     continue;
                 }
                 $bits = explode(',', $l);
-                $x = $this->factory($tn);
                 $rr = array(
                     'etype' => $req['etype'],
                     'name' => array_shift($bits)
@@ -182,10 +183,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 
                 $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
                 
-                
+                $x = $this->factory($tn);
+                $x->beforeInsert($rr, $roo);
+                $x->setFrom($rr);
+                $x->insert();
                 
             }
-            
+            $roo->jok("inserted");
             
         } else {
             $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");