DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

reworks company queries for asset history

Browse source
This commit is contained in:
Godfrey M 2023-08-28 19:35:46 -07:00
parent ffe1b11419
commit 74f45a4473
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Transformers/ActionlogsTransformer.php
View file

@ -153,7 +153,6 @@ class ActionlogsTransformer
*/ */
public function changedInfo(array $clean_meta) public function changedInfo(array $clean_meta)
{ $location = Location::withTrashed()->get(); { $location = Location::withTrashed()->get();
$company = Company::withTrashed()->get();
$supplier = Supplier::withTrashed()->get(); $supplier = Supplier::withTrashed()->get();
$model = AssetModel::withTrashed()->get(); $model = AssetModel::withTrashed()->get();
@ -179,8 +178,14 @@ class ActionlogsTransformer
unset($clean_meta['model_id']); unset($clean_meta['model_id']);
} }
if(array_key_exists('company_id', $clean_meta)) { 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'); $oldCompany = Company::find($clean_meta['company_id']['old']);
$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'); $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']; $clean_meta['Company'] = $clean_meta['company_id'];
unset($clean_meta['company_id']); unset($clean_meta['company_id']);
} }

1
resources/lang/en/admin/companies/message.php
View file

@ -2,6 +2,7 @@
return [ return [
'does_not_exist' => 'Company does not exist.', '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. ', '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' => [ 'create' => [
'error' => 'Company was not created, please try again.', 'error' => 'Company was not created, please try again.',