Merge pull request #70 from tailflow/hotfix/force-deleting-trashed-en…

…tities fix: force deleting a batch of trashed entities
tailflow · Mar 29, 2021 · 0fd5f65 · 0fd5f65
2 parents 063f7c7 + b535228
commit 0fd5f65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Concerns/HandlesStandardBatchOperations.php b/src/Concerns/HandlesStandardBatchOperations.php
@@ -151,7 +151,7 @@ public function batchDestroy(Request $request)
 
         $requestedRelations = $this->relationsResolver->requestedRelations($request);
 
-        $query = $this->buildBatchDestroyFetchQuery($request, $requestedRelations);
+        $query = $this->buildBatchDestroyFetchQuery($request, $requestedRelations, $softDeletes);
         $entities = $this->runBatchDestroyFetchQuery($request, $query);
 
         foreach ($entities as $entity) {
@@ -189,11 +189,15 @@ public function batchDestroy(Request $request)
      *
      * @param Request $request
      * @param array $requestedRelations
+     * @param bool $softDeletes
      * @return Builder
      */
-    protected function buildBatchDestroyFetchQuery(Request $request, array $requestedRelations): Builder
+    protected function buildBatchDestroyFetchQuery(Request $request, array $requestedRelations, bool $softDeletes): Builder
     {
-        return $this->buildBatchFetchQuery($request, $requestedRelations);
+        return $this->buildBatchFetchQuery($request, $requestedRelations)
+            ->when($softDeletes, function ($query) {
+                $query->withTrashed();
+            });
     }
 
     /**

diff --git a/src/Testing/InteractsWithResources.php b/src/Testing/InteractsWithResources.php
@@ -459,7 +459,7 @@ protected function buildMetaLink(?string $url, $label, bool $active): array
     {
         return [
             'url' => $url,
-            'label' => $label,
+            'label' => (string) $label,
             'active' => $active
         ];
     }