From 83376283235f18fee46a3244232f9730bcaded4d Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Jun 2022 20:57:18 -0700 Subject: [PATCH 1/4] Set elvis operator to ensure ldap version is 3 if null Signed-off-by: snipe --- app/Models/Ldap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php index 14be2fd56..935270a56 100644 --- a/app/Models/Ldap.php +++ b/app/Models/Ldap.php @@ -37,7 +37,7 @@ class Ldap extends Model public static function connectToLdap() { $ldap_host = Setting::getSettings()->ldap_server; - $ldap_version = Setting::getSettings()->ldap_version; + $ldap_version = Setting::getSettings()->ldap_version ?: 3; $ldap_server_cert_ignore = Setting::getSettings()->ldap_server_cert_ignore; $ldap_use_tls = Setting::getSettings()->ldap_tls; From 5458676eadd4a60e04f3140c2e81ebcf5d95e97a Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 Jun 2022 21:00:22 -0700 Subject: [PATCH 2/4] Default to v3 of LDAP on settings save Signed-off-by: snipe --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 1bdab1bab..d6574f17c 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -942,7 +942,7 @@ class SettingsController extends Controller $setting->ldap_lname_field = $request->input('ldap_lname_field'); $setting->ldap_fname_field = $request->input('ldap_fname_field'); $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query'); - $setting->ldap_version = $request->input('ldap_version'); + $setting->ldap_version = $request->input('ldap_version', 3); $setting->ldap_active_flag = $request->input('ldap_active_flag'); $setting->ldap_emp_num = $request->input('ldap_emp_num'); $setting->ldap_email = $request->input('ldap_email'); From 4c1104147754098f560fafa1d578a0367c037751 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 9 Jun 2022 17:17:38 -0700 Subject: [PATCH 3/4] Fixed regression: missing restore option for assets via API Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 29 ++++++++++++------- routes/api.php | 13 ++++++++- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 2fa51dcd1..ac5185cf2 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -714,23 +714,32 @@ class AssetsController extends Controller * @since [v5.1.18] * @return JsonResponse */ - public function restore($assetId = null) + public function restore(Request $request, $assetId = null) { // Get asset information $asset = Asset::withTrashed()->find($assetId); $this->authorize('delete', $asset); + if (isset($asset->id)) { - // Restore the asset - Asset::withTrashed()->where('id', $assetId)->restore(); - $logaction = new Actionlog(); - $logaction->item_type = Asset::class; - $logaction->item_id = $asset->id; - $logaction->created_at = date("Y-m-d H:i:s"); - $logaction->user_id = Auth::user()->id; - $logaction->logaction('restored'); + if ($asset->deleted_at=='') { + $message = 'Asset was not deleted. No data was changed.'; - return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.restore.success'))); + } else { + + $message = trans('admin/hardware/message.restore.success'); + // Restore the asset + Asset::withTrashed()->where('id', $assetId)->restore(); + + $logaction = new Actionlog(); + $logaction->item_type = Asset::class; + $logaction->item_id = $asset->id; + $logaction->created_at = date("Y-m-d H:i:s"); + $logaction->user_id = Auth::user()->id; + $logaction->logaction('restored'); + } + + return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset, $request), $message)); } diff --git a/routes/api.php b/routes/api.php index de2e3b758..921af2f1c 100644 --- a/routes/api.php +++ b/routes/api.php @@ -483,7 +483,18 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:'.config('app. 'checkout' ] )->name('api.asset.checkout'); - }); + + Route::post('{asset_id}/restore', + [ + Api\AssetsController::class, + 'restore' + ] + )->name('api.assets.restore'); + + }); + + + Route::resource('hardware', From 93e4d23143679367defa52585ce31cd8615234dd Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 13 Jun 2022 18:36:13 -0700 Subject: [PATCH 4/4] Changed font-awesome leading class Signed-off-by: snipe --- resources/views/partials/bootstrap-table.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 9a63ca58b..a712cea86 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -318,7 +318,7 @@ item_icon = 'fas fa-user'; } else if (value.type == 'location') { item_destination = 'locations' - item_icon = 'far fa-map-marker-alt'; + item_icon = 'fas fa-map-marker-alt'; } return ' ' + value.name + '';