Skip to content

Commit

Permalink
Merge pull request #15241 from snipe/partial_revert_for_checkout_acce…
Browse files Browse the repository at this point in the history
…ssories_to_non_user

Partial revert for checkout accessories to non user
snipe authored Aug 7, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 766b370 + 0dc7e8b commit deef9ad
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/CheckInOutRequest.php
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ protected function determineCheckoutTarget() : ?SnipeModel
return Location::findOrFail(request('assigned_location'));
case 'asset':
return Asset::findOrFail(request('assigned_asset'));
case 'user':
default:
return User::findOrFail(request('assigned_user'));
}

6 changes: 0 additions & 6 deletions resources/views/accessories/checkout.blade.php
Original file line number Diff line number Diff line change
@@ -66,14 +66,8 @@
</div>
<!-- User -->

@include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])

@include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_user', 'required'=> 'true'])

<!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
@include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;', 'required'=>'true'])

@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required'=>'true'])

<!-- Checkout QTY -->
<div class="form-group {{ $errors->has('checkout_qty') ? 'error' : '' }} ">

0 comments on commit deef9ad

Please sign in to comment.