A free open source IT asset/license management system
Updated tranformers
snipe541128dd7ab6
diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.phpindex de9522f1fd..a85115a75e 100644--- a/app/Http/Transformers/ActionlogsTransformer.php+++ b/app/Http/Transformers/ActionlogsTransformer.php@@ -293,6 +293,28 @@ class ActionlogsTransformer$clean_meta[trans('general.company')] = $clean_meta['company_id'];unset($clean_meta['company_id']);}++ if (array_key_exists('companies', $clean_meta)) {+ // clean_field() JSON-encodes array values into a string (e.g. "[14,15]").+ // Decode them back to integer arrays before resolving names.+ // Use withoutGlobalScopes so FMCS does not hide companies from the log viewer.+ $resolveCompanyNames = function ($rawValue): string {+ $ids = json_decode($rawValue, true);+ if (empty($ids) || ! is_array($ids)) {+ return trans('general.unassigned');+ }++ return collect($ids)+ ->map(fn ($id) => Company::withoutGlobalScopes()->withTrashed()->find($id))+ ->map(fn ($c) => $c ? e($c->name) : trans('general.deleted'))+ ->join(', ');+ };++ $clean_meta['companies']['old'] = $resolveCompanyNames($clean_meta['companies']['old']);+ $clean_meta['companies']['new'] = $resolveCompanyNames($clean_meta['companies']['new']);+ $clean_meta[trans('general.companies')] = $clean_meta['companies'];+ unset($clean_meta['companies']);+ }if (array_key_exists('supplier_id', $clean_meta)) {$oldSupplier = $supplier->find($clean_meta['supplier_id']['old']);diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.phpindex 08ce3e8bcc..d0f78280c0 100644--- a/app/Http/Transformers/LicenseSeatsTransformer.php+++ b/app/Http/Transformers/LicenseSeatsTransformer.php@@ -38,11 +38,11 @@ class LicenseSeatsTransformer'tag_color' => $seat->user->department->tag_color ? e($seat->user->department->tag_color) : null,] : null,- 'company' => ($seat->user->company) ?+ 'company' => ($seat->user->companies->isNotEmpty()) ?[- 'id' => (int) $seat->user->company->id,- 'name' => e($seat->user->company->name),- 'tag_color' => $seat->user->company->tag_color ? e($seat->user->company->tag_color) : null,+ 'id' => (int) $seat->user->companies->first()->id,+ 'name' => e($seat->user->companies->first()->name),+ 'tag_color' => $seat->user->companies->first()->tag_color ? e($seat->user->companies->first()->tag_color) : null,] : null,'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.phpindex 7d295356a5..8c2365bf62 100644--- a/app/Http/Transformers/UsersTransformer.php+++ b/app/Http/Transformers/UsersTransformer.php@@ -82,11 +82,17 @@ class UsersTransformer'consumables_count' => (int) $user->consumables_count,'manages_users_count' => (int) $user->manages_users_count,'manages_locations_count' => (int) $user->manages_locations_count,- 'company' => ($user->company) ? [- 'id' => (int) $user->company->id,- 'name' => e($user->company->name),- 'tag_color' => ($user->company->tag_color) ? e($user->company->tag_color) : null,+ // Legacy field — kept for backward API compatibility; use `companies` for multi-company support.+ 'company' => $user->companies->isNotEmpty() ? [+ 'id' => (int) $user->companies->first()->id,+ 'name' => e($user->companies->first()->name),+ 'tag_color' => ($user->companies->first()->tag_color) ? e($user->companies->first()->tag_color) : null,] : null,+ 'companies' => $user->companies->map(fn ($c) => [+ 'id' => (int) $c->id,+ 'name' => e($c->name),+ 'tag_color' => $c->tag_color ? e($c->tag_color) : null,+ ])->values(),'created_by' => ($user->createdBy) ? ['id' => (int) $user->createdBy->id,'name' => e($user->createdBy->display_name),