DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes BS tables for items that don’t have a checkin

Browse source
This commit is contained in:
snipe 2017-03-11 12:11:24 -08:00
parent 742e3d044e
commit 79197a719e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/views/partials/bootstrap-table.blade.php
View file

@ -146,17 +146,17 @@ $('.snipe-table').bootstrapTable({
return function (value,row) { return function (value,row) {
// The user is allowed to check items out, AND the item is deployable // The user is allowed to check items out, AND the item is deployable
if ((row.available_actions.checkout === true) && (row.can_checkout === true)) { if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && (!row.assigned_to)) {
return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm btn-primary">{{ trans('general.checkout') }}</a>'; return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm btn-primary">{{ trans('general.checkout') }}</a>';
// The user is allowed to check items out, but the item is not deployable // The user is allowed to check items out, but the item is not deployable
} else if (((row.can_checkout == 'true')) && (row.available_actions.checkout == 'false') && (row.assigned_to == null)) { } else if (((row.user_can_checkout == false)) && (row.available_actions.checkout == true) && (!row.assigned_to)) {
return '<a class="btn btn-sm btn-primary disabled">{{ trans('general.checkout') }}</a>'; return '<a class="btn btn-sm btn-primary disabled">{{ trans('general.checkout') }}</a>';
// The user is allowed to check items in // The user is allowed to check items in
} else if (row.available_actions.checkin === true) { } else if ((row.available_actions.checkin == true) && (row.assigned_to)) {
return '<nobr><a href="{{ url('/') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm btn-primary">{{ trans('general.checkin') }}</a>'; return '<nobr><a href="{{ url('/') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm btn-primary">{{ trans('general.checkin') }}</a>';
} }
} }