From 96712cb398d5d4142068166daddc5ce983a67041 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Sep 2024 10:55:26 +0100 Subject: [PATCH 1/5] Fixed app settings view on mobile Signed-off-by: snipe --- resources/views/settings/index.blade.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 5a4c91c44..213797575 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -356,7 +356,8 @@

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

-
+
+
@@ -364,13 +365,13 @@ {{ 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
@@ -434,12 +435,15 @@
{{ trans('admin/settings/general.bs_table_storage') }}:
-
+
{{ config('session.bs_table_storage') }}
- +
+
+
+
- +
From 66249a37ed6ea5982d4aca91a2d4d77f5e61488b Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Sep 2024 11:08:31 +0100 Subject: [PATCH 2/5] Tweaked styles Signed-off-by: snipe --- resources/views/settings/index.blade.php | 38 ++++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 213797575..6f9958dde 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -357,21 +357,21 @@
-
+
-
+
{{ trans('admin/settings/general.snipe_version') }}:
-
+
{{ config('version.app_version') }} build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
-
+
{{ trans('admin/settings/general.license') }}:
-
+
AGPL3
@@ -379,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') }}>
@@ -432,10 +432,10 @@
-
+
{{ trans('admin/settings/general.bs_table_storage') }}:
-
+
{{ config('session.bs_table_storage') }}
From de57d71bf12dc48bef933e6c64e23e8724996297 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Sep 2024 16:30:24 +0100 Subject: [PATCH 3/5] Fixed #15548 - unify audit due/overdue APIs Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 3 ++- routes/api.php | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 241b0f7b0..9cd05b49c 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -154,7 +154,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 ('audit' || 'audits'): switch ($upcoming_status) { case 'due': diff --git a/routes/api.php b/routes/api.php index 108f2ac23..8e3c02af0 100644 --- a/routes/api.php +++ b/routes/api.php @@ -495,13 +495,6 @@ 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'); @@ -512,7 +505,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi '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']); From 5fb43dd159b1af02c82f2b3a3f3530c9ca6612ec Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Sep 2024 16:55:56 +0100 Subject: [PATCH 4/5] Handle `audit` *and* `audits` for urls Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 16 ++++++++++++++-- routes/api.php | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 9cd05b49c..882126f66 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; /** @@ -155,30 +160,37 @@ class AssetsController extends Controller */ switch ($action) { // Audit (singular) is left over from earlier legacy APIs - case ('audit' || 'audits'): - + case 'audits' : + \Log::error('audit/audits'); switch ($upcoming_status) { case 'due': + \Log::error('due'); $assets->DueForAudit($settings); break; case 'overdue': + \Log::error('overdue'); $assets->OverdueForAudit(); break; case 'due-or-overdue': + \Log::error('due-or-overdue'); $assets->DueOrOverdueForAudit($settings); break; } break; case 'checkins': + \Log::error('checkins'); switch ($upcoming_status) { case 'due': + \Log::error('due'); $assets->DueForCheckin($settings); break; case 'overdue': + \Log::error('overdue'); $assets->OverdueForCheckin(); break; case 'due-or-overdue': + \Log::error('due-or-overdue'); $assets->DueOrOverdueForCheckin($settings); break; } diff --git a/routes/api.php b/routes/api.php index 8e3c02af0..0581a0468 100644 --- a/routes/api.php +++ b/routes/api.php @@ -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}', [ Api\AssetsController::class, From 0ce5832b6cbed103433664fd9aa08cef2c1fd796 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Sep 2024 17:29:40 +0100 Subject: [PATCH 5/5] Removed debugging Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 882126f66..514f4484c 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -161,36 +161,28 @@ class AssetsController extends Controller switch ($action) { // Audit (singular) is left over from earlier legacy APIs case 'audits' : - \Log::error('audit/audits'); switch ($upcoming_status) { case 'due': - \Log::error('due'); $assets->DueForAudit($settings); break; case 'overdue': - \Log::error('overdue'); $assets->OverdueForAudit(); break; case 'due-or-overdue': - \Log::error('due-or-overdue'); $assets->DueOrOverdueForAudit($settings); break; } break; case 'checkins': - \Log::error('checkins'); switch ($upcoming_status) { case 'due': - \Log::error('due'); $assets->DueForCheckin($settings); break; case 'overdue': - \Log::error('overdue'); $assets->OverdueForCheckin(); break; case 'due-or-overdue': - \Log::error('due-or-overdue'); $assets->DueOrOverdueForCheckin($settings); break; }