diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index c33e1269b8..8af6f62c64 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -211,12 +211,12 @@ class AssetsTransformer 'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'), 'location' => ($asset->location) ? e($asset->location->name) : null, 'status'=> ($asset->assetstatus) ? $asset->present()->statusMeta : null, + 'assigned_to_self' => ($asset->assigned_to == \Auth::user()->id), ]; $permissions_array['available_actions'] = [ 'cancel' => ($asset->isRequestedBy(\Auth::user())) ? true : false, 'request' => ($asset->isRequestedBy(\Auth::user())) ? false : true, - ]; $array += $permissions_array; diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 7c2efd1a68..b0562fefeb 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -363,7 +363,9 @@ // This is only used by the requestable assets section function assetRequestActionsFormatter (row, value) { - if (value.available_actions.cancel == true) { + if (value.assigned_to_self == true){ + return ''; + } else if (value.available_actions.cancel == true) { return '
'; } else if (value.available_actions.request == true) { return '
';