X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=3e7a3e5e382965ff319500ca5261e517753d1906;hp=a1de8f5dcf1d9ff063082c2683356d687c999fd4;hb=c98ecec2c1a5bef7fc437e26e51e6f6fece615a6;hpb=f7656fbe260d7fb15fc05b4d055d26e792722f39

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index a1de8f5d..3e7a3e5e 100644
--- 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 
 {
@@ -40,7 +40,8 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function applyFilters($q, $au)
     {
-       $tn = $this->tableName();
+        
+        $tn = $this->tableName();
         $this->selectAdd("i18n_translate('c' , {$tn}.country, 'en') as country_display_name ");
       
         $tn = $this->tableName();
@@ -48,7 +49,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         $x = DB_DataObject::factory('core_company');
         $x->comptype= 'OWNER';
         $x->find(true);
-        
+
         if (!empty($q['query']['company_project_id'])) {
             $add = '';
             if (!empty($q['query']['company_include_self'])) {
@@ -57,6 +58,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             if (!empty($q['query']['company_not_self'])) {
                 $add = " AND {$tn}.id != {$x->id}";
             }
+            
             $pids = array();
             $pid = $q['query']['company_project_id'];
             if (strpos($pid, ',')) {
@@ -102,7 +104,13 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
                 ) as comptype_display_name
         ");
         
-        if(!empty($q['search']['name'])){
+        if(!empty($q['query']['name'])){
+            $s = $this->escape($q['query']['name']);
+            $this->whereAdd("
+                {$tn}.name LIKE '%$s%'
+            ");
+        }
+        if(!empty($q['search']['name'])){ 
             $s = $this->escape($q['search']['name']);
             $this->whereAdd("
                 {$tn}.name LIKE '%$s%'
@@ -121,7 +129,9 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     }
     
     // ---------- AUTHENTICATION
-     function isAuth()
+    // not sure where authetnication via company is used?? posibly media-outreach
+    
+    function isAuth()
     {
         $db = $this->getDatabaseConnection();
         $sesPrefix = $db->dsn['database'];
@@ -240,19 +250,57 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             $this->update();
         }
         
+    }
+    
+    function beforeInsert($q, $roo)
+    {
+        // we still use comptype in some old systems...
         
+        if(!empty($q['_merge_id'])){
+            $this->merge($q['_merge_id'], $roo);
+        }
         
+        if (!empty($q['comptype_id'])) {
+            $en = DB_DataObject::Factory('core_enum');
+            $en->get($q['comptype_id']);
+            $this->comptype = $en->name;
+        }
         
+        if(!empty($q['_check_name'])){
+            if($this->checkName()){
+                $roo->jok('OK');
+            }
+            
+            $roo->jerr('EXIST');
+        }
     }
     
     function beforeUpdate($old, $q,$roo)
     {
-        if(!empty($q['_check_name'])){
-            $this->checkName($roo);
+        // we still use comptype in some old systems...
+        
+        if (!empty($q['comptype_id'])) {
+            $en = DB_DataObject::Factory('core_enum');
+            $en->get($q['comptype_id']);
+            $this->comptype = $en->name;
         }
         
-        if(!empty($q['_merge_id'])){
-            $this->merge($q['_merge_id'], $roo);
+        
+        if(!empty($q['_flag_delete'])){
+            $this->deleted_dt = $this->sqlValue("NOW()");
+            $this->deleted_by = $roo->getAuthUser()->id;
+        }
+        
+        if(!empty($q['_flag_undelete'])){
+            $this->deleted_dt = "";
+            $this->deleted_by = 0;
+        }
+        if(!empty($q['_check_name'])){
+            if($this->checkName()){
+                $roo->jok('OK');
+            }
+            
+            $roo->jerr('EXIST');
         }
         
         if(!empty($this->is_system) && 
@@ -264,12 +312,18 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeDelete($req, $roo)
     {
+        
         // should check for members....
         if(!empty($this->is_system) && 
             ($old->code != $this->code || $old->name != $this->name)
         ){
             $roo->jerr('This company is not allow to delete');
         }
+        
+        
+    }
+    function onDelete($req, $roo)
+    {   
         $img = DB_DataObject::factory('Images');
         $img->ontable = $this->tableName();
         $img->onid = $this->id;
@@ -419,7 +473,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         $companies->insert();
         $companies->onInsert(array(), $roo);
     }
-    function lookupOwner()
+    static function lookupOwner()
     {
         $enum = DB_DataObject::Factory('core_enum')->lookup('COMPTYPE', 'OWNER'  );
         $companies = DB_DataObject::factory('core_company');
@@ -434,7 +488,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     {
         $affects  = array();
         
-        $all_links = $GLOBALS['_DB_DATAOBJECT']['LINKS'][$this->_database];
+        $all_links = $this->databaseLinks();
         
         foreach($all_links as $tbl => $links) {
             foreach($links as $col => $totbl_col) {
@@ -470,4 +524,22 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         $roo->jok('Merged');
         
     }
+    
+    function checkName()
+    {
+        $company = DB_DataObject::factory('core_company');
+        $company->setFrom(array(
+            'name' => $this->name
+        ));
+        
+        if(!empty($this->id)){
+            $company->whereAdd("id != {$this->id}");
+        }
+        
+        if(!$company->find(true)){
+            return true;
+        }
+        
+        return false;
+    }
 }