A free open source IT asset/license management system
Merge remote-tracking branch 'origin/master' into develop
snipe445fb6f25344
diff --cc resources/views/hardware/edit.blade.phpindex 6b61a77114,2fb6b11623..f4c43e330c--- a/resources/views/hardware/edit.blade.php+++ b/resources/views/hardware/edit.blade.php@@@ -289,12 -292,14 +292,14 @@@$("#selected_status_status").addClass('text-success');$("#selected_status_status").html('<x-icon type="checkmark" /> {{ trans_choice('admin/hardware/form.asset_deployable', 1)}}');-} else {$("#assignto_selector").hide();+ $("#assigned_user").hide();+ $("#assigned_asset").hide();+ $("#assigned_location").hide();$("#selected_status_status").removeClass('text-success');$("#selected_status_status").addClass('text-danger');- $("#selected_status_status").html('<x-icon type="warning" /> {{ (($item->assigned_to!='') && ($item->assigned_type!='') && ($item->deleted_at == '')) ? trans('admin/hardware/form.asset_not_deployable_checkin') : trans('admin/hardware/form.asset_not_deployable') }} ');+ $("#selected_status_status").html('<x-icon type="warning" /> {{ (($item->assigned_to!='') && ($item->assigned_type!='') && ($item->deleted_at == '')) ? trans_choice('admin/hardware/form.asset_not_deployable_checkin', 1) : trans('admin/hardware/form.asset_not_deployable') }} ');}}});