Merge pull request #14051 from akemidx/email_in_license_table

Email in License Seat Table
This commit is contained in:
snipe 2024-01-24 15:37:43 +00:00 committed by GitHub
commit fff21416be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions

View file

@ -29,6 +29,7 @@ class LicenseSeatsTransformer
'assigned_user' => ($seat->user) ? [ 'assigned_user' => ($seat->user) ? [
'id' => (int) $seat->user->id, 'id' => (int) $seat->user->id,
'name'=> e($seat->user->present()->fullName), 'name'=> e($seat->user->present()->fullName),
'email' => e($seat->user->email),
'department'=> ($seat->user->department) ? 'department'=> ($seat->user->department) ?
[ [
'id' => (int) $seat->user->department->id, 'id' => (int) $seat->user->department->id,

View file

@ -228,6 +228,14 @@ class LicensePresenter extends Presenter
'title' => trans('admin/licenses/general.user'), 'title' => trans('admin/licenses/general.user'),
'visible' => true, 'visible' => true,
'formatter' => 'usersLinkObjFormatter', 'formatter' => 'usersLinkObjFormatter',
], [
'field' => 'assigned_user.email',
'searchable' => false,
'sortable' => false,
'switchable' => true,
'title' => trans('admin/users/table.email'),
'visible' => true,
'formatter' => 'emailFormatter',
], [ ], [
'field' => 'department', 'field' => 'department',
'searchable' => false, 'searchable' => false,
@ -236,8 +244,7 @@ class LicensePresenter extends Presenter
'title' => trans('general.department'), 'title' => trans('general.department'),
'visible' => false, 'visible' => false,
'formatter' => 'departmentNameLinkFormatter', 'formatter' => 'departmentNameLinkFormatter',
], ], [
[
'field' => 'assigned_asset', 'field' => 'assigned_asset',
'searchable' => false, 'searchable' => false,
'sortable' => false, 'sortable' => false,