Skip to content

Commit f68b61c

Browse files
committed
fix: force deleting a batch of trashed entities
1 parent 063f7c7 commit f68b61c

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/Concerns/HandlesStandardBatchOperations.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function batchDestroy(Request $request)
151151

152152
$requestedRelations = $this->relationsResolver->requestedRelations($request);
153153

154-
$query = $this->buildBatchDestroyFetchQuery($request, $requestedRelations);
154+
$query = $this->buildBatchDestroyFetchQuery($request, $requestedRelations, $softDeletes);
155155
$entities = $this->runBatchDestroyFetchQuery($request, $query);
156156

157157
foreach ($entities as $entity) {
@@ -189,11 +189,15 @@ public function batchDestroy(Request $request)
189189
*
190190
* @param Request $request
191191
* @param array $requestedRelations
192+
* @param bool $softDeletes
192193
* @return Builder
193194
*/
194-
protected function buildBatchDestroyFetchQuery(Request $request, array $requestedRelations): Builder
195+
protected function buildBatchDestroyFetchQuery(Request $request, array $requestedRelations, bool $softDeletes): Builder
195196
{
196-
return $this->buildBatchFetchQuery($request, $requestedRelations);
197+
return $this->buildBatchFetchQuery($request, $requestedRelations)
198+
->when($softDeletes, function ($query) {
199+
$query->withTrashed();
200+
});
197201
}
198202

199203
/**

0 commit comments

Comments
 (0)