mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-10 22:05:47 +00:00
Code Issues Projects Releases Wiki Activity

Added feature to cancel requests from the Requested Assets view

Browse Source
This commit is contained in:
Ivan Nieto Vivanco
2023-06-27 18:11:10 -06:00
parent eb4d764601
commit 1c29bd37a6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ViewAssetsController.php
View File

@ -82,7 +82,7 @@ class ViewAssetsController extends Controller
return view('account/requestable-assets', compact('assets', 'models'));
}
public function getRequestItem(Request $request, $itemType, $itemId = null)
public function getRequestItem(Request $request, $itemType, $itemId = null, $cancel_by_admin = false, $requestingUser = null)
{
$item = null;
$fullItemType = 'App\\Models\\'.studly_case($itemType);
@ -119,8 +119,8 @@ class ViewAssetsController extends Controller
$settings = Setting::getSettings();
if ($item_request = $item->isRequestedBy($user)) {
$item->cancelRequest();
if (($item_request = $item->isRequestedBy($user)) || $cancel_by_admin) {
$item->cancelRequest($requestingUser);
$data['item_quantity'] = $item_request->qty;
$logaction->logaction('request_canceled');