A free open source IT asset/license management system
Fixed FD-55585 - check canceled_by_admin more closely
snipe6da5f2e19b72
diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.phpindex 13ef76ab5a..8e8f70cca0 100755--- a/app/Http/Controllers/ViewAssetsController.php+++ b/app/Http/Controllers/ViewAssetsController.php@@ -200,8 +200,12 @@ class ViewAssetsController extends Controller$settings = Setting::getSettings();+ if ($cancel_by_admin) {+ $this->authorize('index', Asset::class);+ }+if (($item_request = $item->isRequestedBy($user)) || $cancel_by_admin) {- $item->cancelRequest($requestingUser);+ $item->cancelRequest($cancel_by_admin ? $requestingUser : null);$data['item_quantity'] = ($item_request) ? $item_request->qty : 1;$logaction->logaction(ActionType::RequestCanceled);