From 25e99194ce520a16edc1e15e0639a6246fbb27c5 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 20 Jun 2017 14:41:30 -0700 Subject: [PATCH] Fixes #3681 - corrected fieldname for bulk asset delete --- app/Http/Controllers/AssetsController.php | 6 ++++-- resources/lang/en/admin/hardware/message.php | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index f0a978f40c..892db747f1 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -1222,8 +1222,10 @@ class AssetsController extends Controller public function postBulkDelete() { $this->authorize('delete', Asset::class); - if (Input::has('bulk_edit')) { - $assets = Asset::find(Input::get('bulk_edit')); + + + if (Input::has('ids')) { + $assets = Asset::find(Input::get('ids')); foreach ($assets as $asset) { $update_array['deleted_at'] = date('Y-m-d H:i:s'); $update_array['assigned_to'] = null; diff --git a/resources/lang/en/admin/hardware/message.php b/resources/lang/en/admin/hardware/message.php index d27ca91573..df20960b2d 100644 --- a/resources/lang/en/admin/hardware/message.php +++ b/resources/lang/en/admin/hardware/message.php @@ -48,6 +48,7 @@ return array( 'delete' => array( 'confirm' => 'Are you sure you wish to delete this asset?', 'error' => 'There was an issue deleting the asset. Please try again.', + 'nothing_updated' => 'No assets were selected, so nothing was deleted.', 'success' => 'The asset was deleted successfully.' ),