diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 241b0f7b0e..514f4484c8 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -56,6 +56,11 @@ class AssetsController extends Controller 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; /** @@ -154,8 +159,8 @@ class AssetsController extends Controller * Handle due and overdue audits and checkin dates */ switch ($action) { - case 'audits': - + // Audit (singular) is left over from earlier legacy APIs + case 'audits' : switch ($upcoming_status) { case 'due': $assets->DueForAudit($settings); diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 5a4c91c446..6f9958dde3 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -356,21 +356,22 @@

{{ trans('admin/settings/general.system') }}

-
+
+
-
+
{{ trans('admin/settings/general.snipe_version') }}:
-
- {{ config('version.app_version') }} build {{ config('version.build_version') }} ({{ config('version.hash_version') }}) +
+ {{ config('version.app_version') }} build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
-
+
{{ trans('admin/settings/general.license') }}:
-
+
AGPL3
@@ -378,52 +379,52 @@
-
+
{{ trans('admin/settings/general.php') }}:
-
+
{{ phpversion() }}
-
+
{{ trans('admin/settings/general.laravel') }}:
-
+
{{ $snipeSettings->lar_ver() }}
-
+
{{ trans('admin/settings/general.timezone') }}:
-
+
{{ config('app.timezone') }}
-
+
{{ trans('admin/settings/general.database_driver') }}:
-
+
{{ config('database.default') }}
-
+
{{ trans('admin/settings/general.mail_from') }}:
-
+
{{ config('mail.from.name') }} <{{ config('mail.from.address') }}>
-
+
{{ trans('admin/settings/general.mail_reply_to') }}:
-
+
{{ config('mail.reply_to.name') }} <{{ config('mail.reply_to.address') }}>
@@ -431,15 +432,18 @@
-
+
{{ trans('admin/settings/general.bs_table_storage') }}:
-
+
{{ config('session.bs_table_storage') }}
- +
+
+
+
- +
diff --git a/routes/api.php b/routes/api.php index 108f2ac231..0581a04682 100644 --- a/routes/api.php +++ b/routes/api.php @@ -495,24 +495,17 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi )->name('api.assets.show.byserial') ->where('any', '.*'); - // LEGACY URL - Get assets that are due or overdue for audit - Route::get('audit/{status}', - [ - Api\AssetsController::class, - 'index' - ] - )->name('api.asset.to-audit'); - // 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}', [ Api\AssetsController::class, 'index' ] )->name('api.assets.list-upcoming') - ->where(['action' => 'audits|checkins', 'upcoming_status' => 'due|overdue|due-or-overdue']); + ->where(['action' => 'audit|audits|checkins', 'upcoming_status' => 'due|overdue|due-or-overdue']);