DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle audit *and* audits for urls

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-09-24 16:55:56 +01:00
parent de57d71bf1
commit 5fb43dd159
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Http/Controllers/Api/AssetsController.php
View file

@ -56,6 +56,11 @@ class AssetsController extends Controller
public function index(Request $request, $action = null, $upcoming_status = null) : JsonResponse | array public function index(Request $request, $action = null, $upcoming_status = null) : JsonResponse | array
{ {
// This handles the legacy audit endpoints :(
if ($action == 'audit') {
$action = 'audits';
}
$filter_non_deprecable_assets = false; $filter_non_deprecable_assets = false;
/** /**
@ -155,30 +160,37 @@ class AssetsController extends Controller
*/ */
switch ($action) { switch ($action) {
// Audit (singular) is left over from earlier legacy APIs // Audit (singular) is left over from earlier legacy APIs
case ('audit' || 'audits'): case 'audits' :
\Log::error('audit/audits');
switch ($upcoming_status) { switch ($upcoming_status) {
case 'due': case 'due':
\Log::error('due');
$assets->DueForAudit($settings); $assets->DueForAudit($settings);
break; break;
case 'overdue': case 'overdue':
\Log::error('overdue');
$assets->OverdueForAudit(); $assets->OverdueForAudit();
break; break;
case 'due-or-overdue': case 'due-or-overdue':
\Log::error('due-or-overdue');
$assets->DueOrOverdueForAudit($settings); $assets->DueOrOverdueForAudit($settings);
break; break;
} }
break; break;
case 'checkins': case 'checkins':
\Log::error('checkins');
switch ($upcoming_status) { switch ($upcoming_status) {
case 'due': case 'due':
\Log::error('due');
$assets->DueForCheckin($settings); $assets->DueForCheckin($settings);
break; break;
case 'overdue': case 'overdue':
\Log::error('overdue');
$assets->OverdueForCheckin(); $assets->OverdueForCheckin();
break; break;
case 'due-or-overdue': case 'due-or-overdue':
\Log::error('due-or-overdue');
$assets->DueOrOverdueForCheckin($settings); $assets->DueOrOverdueForCheckin($settings);
break; break;
} }

2
routes/api.php
View file

@ -498,7 +498,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
// This gets the "due or overdue" API endpoints for audits and checkins // This gets the "due or overdue" API endpoints for audit/audits and checkins
Route::get('{action}/{upcoming_status}', Route::get('{action}/{upcoming_status}',
[ [
Api\AssetsController::class, Api\AssetsController::class,