commit

[Pman.Core] / DataObjects / Core_company.php

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 27c24d7..abc1506 100644 (file)
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -104,14 +104,19 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
                 ) as comptype_display_name
         ");
         
-        if(!empty($q['query']['name'])){
-            $s = $this->escape($q['query']['name']);
+        if(!empty($q['query']['name']) || !empty($q['search']['name'])){
+            
+            $s = (!empty($q['query']['name'])) ? $this->escape($q['query']['name']) : $this->escape($q['search']['name']);
+            
             $this->whereAdd("
                 {$tn}.name LIKE '%$s%'
             ");
         }
-        if(!empty($q['search']['name_starts'])){
-            $s = $this->escape($q['search']['name_starts']);
+        
+        if(!empty($q['query']['name_starts']) || !empty($q['search']['name_starts'])){
+            
+            $s = (!empty($q['query']['name_starts'])) ? $this->escape($q['query']['name_starts']) : $this->escape($q['search']['name_starts']);
+            
             $this->whereAdd("
                 {$tn}.name LIKE '$s%'
             ");
@@ -248,6 +253,14 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeInsert($q, $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['_check_name'])){
             if($this->checkName()){
                 $roo->jok('OK');
@@ -259,17 +272,21 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
-        if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
-            //$delete_dt = date('Y-m-d H:i:s');
+        // 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['_flag_delete'])){
             $this->deleted_dt = $this->sqlValue("NOW()");
             $this->deleted_by = $roo->getAuthUser()->id;
-        } 
+        }
         
-        if(!empty($q['_flag_delete'])){
-            if($q['_flag_delete'] * 1 == 1){
-                $this->deleted_dt = $this->sqlValue("NOW()");
-                $this->deleted_by = $roo->getAuthUser()->id;
-            }
+        if(!empty($q['_flag_undelete'])){
             $this->deleted_dt = "";
             $this->deleted_by = 0;
         }