From 8d935b34ebbfed3d45f1441ea402445ab8a8148e Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Jan 2025 22:07:53 +0000 Subject: [PATCH 1/4] Fixed audit interval input width Signed-off-by: snipe --- resources/views/settings/alerts.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index ddca5c8158..85f6eec144 100644 --- a/resources/views/settings/alerts.blade.php +++ b/resources/views/settings/alerts.blade.php @@ -120,7 +120,7 @@
{{ Form::label('audit_interval', trans('admin/settings/general.audit_interval')) }}
-
+
{{ Form::text('audit_interval', old('audit_interval', $setting->audit_interval), array('class' => 'form-control','placeholder' => '12', 'maxlength'=>'3')) }} {{ trans('general.months') }}
From 7de5e2e7ef4756cf49fee9713766bc3bcafaeb79 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Jan 2025 22:11:22 +0000 Subject: [PATCH 2/4] One more audot field increase Signed-off-by: snipe --- resources/views/settings/alerts.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index 85f6eec144..9bf578067e 100644 --- a/resources/views/settings/alerts.blade.php +++ b/resources/views/settings/alerts.blade.php @@ -135,7 +135,7 @@
{{ Form::label('audit_warning_days', trans('admin/settings/general.audit_warning_days')) }}
-
+
{{ Form::text('audit_warning_days', old('audit_warning_days', $setting->audit_warning_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3')) }} {{ trans('general.days') }}
From 1d0c156d2e591122aedb2fb766b917a978bb6675 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Jan 2025 22:12:18 +0000 Subject: [PATCH 3/4] Increased due for checkin warning Signed-off-by: snipe --- resources/views/settings/alerts.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index 9bf578067e..fb614a2e81 100644 --- a/resources/views/settings/alerts.blade.php +++ b/resources/views/settings/alerts.blade.php @@ -150,7 +150,7 @@
{{ Form::label('due_checkin_days', trans('admin/settings/general.due_checkin_days')) }}
-
+
{{ Form::text('due_checkin_days', old('due_checkin_days', $setting->due_checkin_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3')) }} {{ trans('general.days') }}
From bbc9ed5778ae047bc76b86c9bf7cf416a9958571 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Jan 2025 22:28:50 +0000 Subject: [PATCH 4/4] Fixed audit date default on bulk audit Signed-off-by: snipe --- app/Http/Controllers/Assets/AssetsController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 98f4b7e38e..6fd27ed03c 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -865,8 +865,8 @@ class AssetsController extends Controller public function quickScan() { $this->authorize('audit', Asset::class); - $dt = Carbon::now()->addMonths(12)->toDateString(); - + $settings = Setting::getSettings(); + $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString(); return view('hardware/quickscan')->with('next_audit_date', $dt); } @@ -883,7 +883,6 @@ class AssetsController extends Controller $this->authorize('audit', Asset::class); $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString(); $asset = Asset::findOrFail($id); - return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list'); }