Merge branch '1.4' into fix-scope-not-working-with-withtrashed

thedevdojo · Jan 28, 2021 · 5c8f19b · 5c8f19b
2 parents e8ce0a3 + 1732bee
commit 5c8f19b
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/Http/Controllers/VoyagerBaseController.php b/src/Http/Controllers/VoyagerBaseController.php
@@ -332,8 +332,19 @@ public function update(Request $request, $id)
 
         // Validate fields with ajax
         $val = $this->validateBread($request->all(), $dataType->editRows, $dataType->name, $id)->validate();
+
+        // Get fields with images to remove before updating and make a copy of $data
+        $to_remove = $dataType->editRows->where('type', 'image')
+            ->filter(function ($item, $key) use ($request) {
+                return $request->hasFile($item->field);
+            });
+        $original_data = clone($data);
+
         $this->insertUpdateData($request, $slug, $dataType->editRows, $data);
 
+        // Delete Images
+        $this->deleteBreadImages($original_data, $to_remove);
+
         event(new BreadDataUpdated($dataType, $data));
 
         if (auth()->user()->can('browse', app($dataType->model_name))) {