X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=a5b5169664e7016ac87f057e9467ab9879cb0486;hb=ef46d9bc89c79c44436dae90698ae73f1a2dac4b;hp=bba8cd0f59acddc4f0c683a7b42298fe25177b55;hpb=40c2707371e7002a0aef5f3f831f2e9bc464d1a7;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index bba8cd0f..a5b51696 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -259,13 +259,15 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
-        var_dump($roo->getAuthUser()); exit;
+         
         if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
-            //$delete_dt = date('Y-m-d H:i:s');
             $this->deleted_dt = $this->sqlValue("NOW()");
-            $this->deleted_by = $roo->getAuthUser()->name;
-            $this->id = $q['_ids'];
-
+            $this->deleted_by = $roo->getAuthUser()->id;
+        }
+        
+        if(!empty($q['_flag_undelete']) && $q['_flag_undelete'] * 1 == 1){
+            $this->deleted_dt = "";
+            $this->deleted_by = 0;
         }
         if(!empty($q['_check_name'])){
             if($this->checkName()){
@@ -323,7 +325,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             return true;
         }
         
-        
+        print_r($au->company()->comptype);exit;
         
         if ($au->company()->comptype != 'OWNER') {