X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=RooPostTrait.php;h=456aa7aa74fde6a79c2611ea8e8561f75ab5d5a8;hp=25f90109470b66075bc493d6a62df65e35a95c2e;hb=refs%2Fheads%2Fwip_alan_T6343_generic_progress_bar_delete;hpb=59bf2f14b82372283839cf73a4d37b01ee84fa79

diff --git a/RooPostTrait.php b/RooPostTrait.php
index 25f90109..456aa7aa 100644
--- a/RooPostTrait.php
+++ b/RooPostTrait.php
@@ -66,7 +66,7 @@ trait Pman_Core_RooPostTrait {
      *
      * CALLS BEFORE change occurs:
      *  
-     *      beforeDelete($dependants_array, $roo)
+     *      beforeDelete($dependants_array, $roo, $request)
      *                      Argument is an array of un-find/fetched dependant items.
      *                      - jerr() will stop insert.. (Prefered)
      *                      - return false for fail and set DO->err;
@@ -170,7 +170,8 @@ trait Pman_Core_RooPostTrait {
         
         $affects  = array();
         
-        $all_links = $GLOBALS['_DB_DATAOBJECT']['LINKS'][$x->_database];
+        $all_links = $x->databaseLinks();
+        
         foreach($all_links as $tbl => $links) {
             foreach($links as $col => $totbl_col) {
                 $to = explode(':', $totbl_col);
@@ -241,7 +242,7 @@ trait Pman_Core_RooPostTrait {
             $match_total = 0;
             
             if ( $has_beforeDelete ) {
-                if ($xx->beforeDelete($match_ar, $this) === false) {
+                if ($xx->beforeDelete($match_ar, $this, $req) === false) {
                     $errs[] = "Delete failed ({$xx->id})\n".
                         (isset($xx->err) ? $xx->err : '');
                     continue;
@@ -282,9 +283,7 @@ trait Pman_Core_RooPostTrait {
           
             }
             
-            DB_DataObject::Factory('Events')->logDeletedRecord($x);
-            
-            $this->addEvent("DELETE", $x);
+            $this->logDeleteEvent($x);
             
             $xx->delete();
             
@@ -301,6 +300,17 @@ trait Pman_Core_RooPostTrait {
         
     }
     
+    function logDeleteEvent($object)
+    {
+        
+        DB_DataObject::Factory('Events')->logDeletedRecord($object);
+        
+        $this->addEvent("DELETE", $object);
+          
+        
+    }
+    
+    
     function update($x, $req,  $with_perm_check = true)
     {
         if ( $with_perm_check && !$this->checkPerm($x,'E', $req) )  {
@@ -386,7 +396,7 @@ trait Pman_Core_RooPostTrait {
     {
         $this->permitError = true; // allow it to fail without dieing
         
-        $lock = DB_DataObjecT::factory('Core_locking');
+        $lock = DB_DataObjecT::factory('core_locking');
         $this->permitError = false; 
         if (is_a($lock,'DB_DataObject') && $this->authUser)  {
                  
@@ -425,7 +435,7 @@ trait Pman_Core_RooPostTrait {
             // edit it anyways...
             
             // can we find the user's lock.
-            $lock = DB_DataObjecT::factory('Core_locking');
+            $lock = DB_DataObjecT::factory('core_locking');
             $lock->on_id = $x->{$this->key};
             $lock->on_table= strtolower($x->tableName());
             $lock->person_id = $this->authUser->id;
@@ -440,21 +450,19 @@ trait Pman_Core_RooPostTrait {
 	            $x->modified_by != $this->authUser->id 	
                 )
             {
-                $p = DB_DataObject::factory('Person');
+                $p = DB_DataObject::factory('core_person');
                 $p->get($x->modified_by);
-		 $this->jerr($p->name . " saved the record since you started editing,\nDo you really want to update it?", array('needs_confirm' => true)); 
+                $this->jerr($p->name . " saved the record since you started editing,\nDo you really want to update it?", array('needs_confirm' => true)); 
                 
             }
-            
-            
         }
+        
         return $lock;
         
     }
     
     function insert($x, $req, $with_perm_check = true)
-    {
-        
+    {   
         if (method_exists($x, 'setFromRoo')) {
             $res = $x->setFromRoo($req, $this);
             if (is_string($res)) {