DataObjects/Core_company.php

[Pman.Core] / DataObjects / Core_company.php

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index dc4f370..13ddb6b 100644 (file)
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Companies
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_Company extends DB_DataObject 
 {
@@ -245,14 +245,22 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     function beforeInsert($q, $roo)
     {
         if(!empty($q['_check_name'])){
-            $this->checkName($roo);
+            if($this->checkName()){
+                $roo->jok('OK');
+            }
+            
+            $roo->jerr('EXIST');
         }
     }
     
     function beforeUpdate($old, $q,$roo)
     {
         if(!empty($q['_check_name'])){
-            $this->checkName($roo);
+            if($this->checkName()){
+                $roo->jok('OK');
+            }
+            
+            $roo->jerr('EXIST');
         }
         
         if(!empty($q['_merge_id'])){
@@ -475,7 +483,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         
     }
     
-    function checkName($roo)
+    function checkName()
     {
         $company = DB_DataObject::factory('core_company');
         $company->setFrom(array(
@@ -487,9 +495,9 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         }
         
         if(!$company->find(true)){
-            $roo->jok('OK');
+            return true;
         }
         
-        $roo->jok('EXISTS');
+        return false;
     }
 }