From 27488c1009c1a8f9d2156c414d7eb7b21ca14174 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 23 Aug 2023 00:32:43 -0700 Subject: [PATCH 1/2] adds soft deletes to eager loading --- app/Http/Transformers/ActionlogsTransformer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index cb28ff8110..dcccc92e6c 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -152,10 +152,10 @@ class ActionlogsTransformer * @return array */ public function changedInfo(array $clean_meta) - { $location = Location::all(); - $company = Company::all(); - $supplier = Supplier::all(); - $model = AssetModel::all(); + { $location = Location::withTrashed()->get(); + $company = Company::withTrashed()->get(); + $supplier = Supplier::withTrashed()->get(); + $model = AssetModel::withTrashed()->get(); if(array_key_exists('rtd_location_id',$clean_meta)) { From 74f45a44739c96d5c6776efa6238fdf64860e3ba Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 28 Aug 2023 19:35:46 -0700 Subject: [PATCH 2/2] reworks company queries for asset history --- app/Http/Transformers/ActionlogsTransformer.php | 11 ++++++++--- resources/lang/en/admin/companies/message.php | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 9198f89d00..16f413c7e7 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -153,7 +153,6 @@ class ActionlogsTransformer */ public function changedInfo(array $clean_meta) { $location = Location::withTrashed()->get(); - $company = Company::withTrashed()->get(); $supplier = Supplier::withTrashed()->get(); $model = AssetModel::withTrashed()->get(); @@ -179,8 +178,14 @@ class ActionlogsTransformer unset($clean_meta['model_id']); } if(array_key_exists('company_id', $clean_meta)) { - $clean_meta['company_id']['old'] = $clean_meta['company_id']['old'] ? "[id: ".$clean_meta['company_id']['old']."]".$company->find($clean_meta['company_id']['old'])->name : trans('general.unassigned'); - $clean_meta['company_id']['new'] = $clean_meta['company_id']['new'] ? "[id: ".$clean_meta['company_id']['new']."] ".$company->find($clean_meta['company_id']['new'])->name : trans('general.unassigned'); + $oldCompany = Company::find($clean_meta['company_id']['old']); + $oldCompanyName = $oldCompany->name ?? trans('admin/companies/message.deleted'); + + $newCompany = Company::find($clean_meta['company_id']['new']); + $newCompanyName = $newCompany->name ?? trans('admin/companies/message.deleted'); + + $clean_meta['company_id']['old'] = $clean_meta['company_id']['old'] ? "[id: ".$clean_meta['company_id']['old']."] ". $oldCompanyName : trans('general.unassigned'); + $clean_meta['company_id']['new'] = $clean_meta['company_id']['new'] ? "[id: ".$clean_meta['company_id']['new']."] ". $newCompanyName : trans('general.unassigned'); $clean_meta['Company'] = $clean_meta['company_id']; unset($clean_meta['company_id']); } diff --git a/resources/lang/en/admin/companies/message.php b/resources/lang/en/admin/companies/message.php index b44bdd4b85..e440b7ac5f 100644 --- a/resources/lang/en/admin/companies/message.php +++ b/resources/lang/en/admin/companies/message.php @@ -2,6 +2,7 @@ return [ 'does_not_exist' => 'Company does not exist.', + 'deleted' => 'Deleted company', 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', 'create' => [ 'error' => 'Company was not created, please try again.',