Skip to content

A free open source IT asset/license management system

Keep removed asset out of scope of partial

Marcus Moorebe848598e321
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index a966b0d28c..e5446477cf 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -630,7 +630,7 @@ class BulkAssetsController extends Controller
return !$asset->assigned_to;
});
- session()->flashInput(['selected_assets' => $assignable->pluck('id')]);
+ session()->flashInput(['selected_assets' => $assignable->pluck('id')->values()->toArray()]);
}
$do_not_change = ['' => trans('general.do_not_change')];
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index 8471eef43a..17538bc71d 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -35,9 +35,9 @@
<div class="box-body">
<p>The following were removed from the selected assets because they are already checked out:</p>
<ul>
- @foreach($removed_assets as $asset)
- <li>{{ $asset->present()->fullName }}</li>
- @endforeach
+ @foreach($removed_assets as $removed_asset)
+ <li>{{ $removed_asset->present()->fullName }}</li>
+ @endforeach
</ul>
</div>
</div>