X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=0e02579d9e752fd541475f796b4f0911b48badd4;hb=79aab1b6ee394922980f14fea3f77da125c8d533;hp=46ef4b3310e2b0896cf1fd2eda09eb890fa5aac4;hpb=bfe81d43844c80cbf9306113786a877ceccca68b;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 46ef4b33..0e02579d 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -82,10 +82,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             $this->whereAddIn('comptype', explode(',', $q['query']['comptype']), 'string');
             
         }
-        /*if (!empty($q['query']['deleted_by'])) {
-            $deleted_by = $this->escape($q['query']['deleted_by']);
-            $this->whereAdd("deleted_by = '$deleted_by'");
-        }*/
+        
         // depricated - should be moved to module specific (texon afair)
         
          if (!empty($q['query']['province'])) {
@@ -262,6 +259,16 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
+         
+        if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
+            $this->deleted_dt = $this->sqlValue("NOW()");
+            $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()){
                 $roo->jok('OK');
@@ -290,10 +297,11 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         ){
             $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;
@@ -458,7 +466,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     {
         $affects  = array();
         
-        $all_links = $x->databaseLinks();
+        $all_links = $this->databaseLinks();
         
         foreach($all_links as $tbl => $links) {
             foreach($links as $col => $totbl_col) {