Skip to content

A free open source IT asset/license management system

Refine checkin checkout button display

snipe48ebd7faf537
diff --git a/app/Http/Controllers/Assets/AssetCheckinController.php b/app/Http/Controllers/Assets/AssetCheckinController.php
index a24204fa0c..8ab4cc74e1 100644
--- a/app/Http/Controllers/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -206,7 +206,7 @@ class AssetCheckinController extends Controller
$asset->assigned_type = null;
if ($asset->save()) {
- $asset->logForceCheckin(note: trans('general.force_checkin'));
+ $asset->logForceCheckin();
return redirect()->route('hardware.show', $asset->id)
->with('success', trans('admin/hardware/message.checkin.force_checkin_orphaned_success'));
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 096fb20334..1c3132b8df 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -422,7 +422,10 @@
<x-box class="side-box expanded">
<x-info-panel :infoPanelObj="$asset" img_path="{{ app('assets_upload_url') }}">
<x-slot:buttons>
+
+ @if ($asset->assignedTo=='')
<x-button.checkout permission="checkout" :item="$asset" :route="route('hardware.checkout.create', $asset->id)"/>
+ @endif
@if (!$asset->hasOrphanedAssignment())
<x-button.checkin permission="checkin" :item="$asset" :route="route('hardware.checkin.create', $asset->id)"/>