DataObjects/core.sql

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index c8e0b2b..e18e02e 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -38,29 +38,34 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         }
         
     }
+    function beforeUpdate($old, $request,$roo)
+    {
+        $tn = $this->tableName();
+        $x = $this->factory($tn);
+        if(!($old->etype == $request['etype'] && $old->name == $request['name'])){
+            $x->whereAdd("etype = '{$request['etype']}' AND name = '{$request['name']}'");
+            $x->find(true);
+            if($x->count() > 0){
+                $roo->jerr('is exsiting');
+            }
+        }
+    }
     function beforeInsert($req, $roo)
     {
-        $x = $this->factory($this->tableName());
+        $tn = $this->tableName();
+        $x = $this->factory($tn);
         
         if(empty($req['etype'])){
             if($x->get('name', $req['name'])){
                 $roo->jerr('name is exsiting');
             }
         }else{
-            $x->whereAdd("etype = {$req['etype']} AND name = {$req['name']}");
+            $x->whereAdd("etype = '{$req['etype']}' AND name = '{$req['name']}'");
             $x->find(true);
             if($x->count() > 0){
                 $roo->jerr('is exsiting');
             }
         }
-//        
-//        //print_r($req);
-//        if($x->get('etype', $req['etype']) && !empty($req['etype'])){
-//            $roo->jerr('etype is exsiting');
-//        }
-//        if($x->get('name', $req['name'])){
-//            $roo->jerr('name is exsiting');
-//        }
     }
     function onInsert($req)
     {