Fixes problem with deleteOneChild and saveMany events

spira · Aug 31, 2015 · 4d38250 · 4d38250
1 parent 9be4349
commit 4d38250
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/api/app/Extensions/Revisionable/ChangeloggableTrait.php b/api/app/Extensions/Revisionable/ChangeloggableTrait.php
@@ -162,7 +162,7 @@ public function postSaveMany($key, Collection $childModels)
         }
 
         if ((!isset($this->revisionEnabled) || $this->revisionEnabled)
-            && (!$limitReached || $RevisionCleanup)
+            && (!$limitReached || $revisionCleanup)
         ) {
             $revisions = [];
 
@@ -171,30 +171,30 @@ public function postSaveMany($key, Collection $childModels)
             // $changes_to_record = $this->changedRevisionableFields();
             // foreach ($changes_to_record as $key => $change) {
             foreach ($childModels as $model) {
-                $revisions[] = array(
+                $revisions[] = [
                     'revisionable_type' => get_class($this),
                     'revisionable_id' => $this->getKey(),
                     'key' => $key,
                     'old_value' => null,
-                    'new_value' => $model->toArray(),
+                    'new_value' => $model->toJson(),
                     'user_id' => $this->getUserId(),
                     'created_at' => new \DateTime(),
                     'updated_at' => new \DateTime(),
-                );
+                ];
             }
 
             if (count($revisions) > 0) {
-                if ($limitReached && $RevisionCleanup) {
+                if ($limitReached && $revisionCleanup) {
                     $toDelete = $this->revisionHistory()->orderBy('id', 'asc')->limit(count($revisions))->get();
                     foreach ($toDelete as $delete) {
                         $delete->delete();
                     }
                 }
+
                 $revision = new Revision;
                 \DB::table($revision->getTable())->insert($revisions);
             }
         }
-
     }
 
     /**
@@ -287,7 +287,7 @@ public function postDeleteOneChild($key, $id)
             ];
 
             $revision = new Revision;
-            \DB::table($revision->getTable())->insert($revisions);
+            \DB::table($revision->getTable())->insert($data);
         }
     }
 
@@ -306,7 +306,6 @@ protected function isRelationRevisionable($relation)
 
         if (isset($this->dontKeepRevisionOf)) {
             return !in_array($relation, $this->dontKeepRevisionOf);
-
         }
 
         return true;

diff --git a/api/app/Http/Controllers/ChildEntityController.php b/api/app/Http/Controllers/ChildEntityController.php
@@ -224,7 +224,7 @@ public function deleteOne($id, $childId)
         $model = $this->findParentEntity($id);
         $childModel = $this->findOrFailChildEntity($childId, $model);
 
-        $this->delete($parent, $childModel);
+        $this->delete($model, $childModel);
 
         return $this->getResponse()->noContent();
     }
@@ -430,7 +430,7 @@ protected function delete(BaseModel $parent, BaseModel $childModel)
 
         $childModel->delete();
 
-        $this->fireModelEvent('deletedOneChild', $parent, [$parent, $this->relationName, $childModels], false);
+        $this->fireModelEvent('deletedOneChild', $parent, [$parent, $this->relationName, $childModel], false);
     }
 
     /**