diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index 78cf49fd9..5e79c49b2 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -27,7 +27,7 @@ class LicenseSeatsController extends Controller if ($license = License::find($licenseId)) { $this->authorize('view', $license); - $seats = LicenseSeat::with('license', 'user', 'email', 'asset', 'user.department') + $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department') ->where('license_seats.license_id', $licenseId); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php index 62614db4d..47133a9b9 100644 --- a/app/Http/Transformers/LicenseSeatsTransformer.php +++ b/app/Http/Transformers/LicenseSeatsTransformer.php @@ -29,6 +29,7 @@ class LicenseSeatsTransformer 'assigned_user' => ($seat->user) ? [ 'id' => (int) $seat->user->id, 'name'=> e($seat->user->present()->fullName), + 'email' => e($seat->user->email), 'department'=> ($seat->user->department) ? [ 'id' => (int) $seat->user->department->id, diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php index 8c827a180..4b86a3506 100644 --- a/app/Presenters/LicensePresenter.php +++ b/app/Presenters/LicensePresenter.php @@ -229,7 +229,7 @@ class LicensePresenter extends Presenter 'visible' => true, 'formatter' => 'usersLinkObjFormatter', ], [ - 'field' => 'email', + 'field' => 'assigned_user.email', 'searchable' => false, 'sortable' => false, 'switchable' => true,