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

adding column, needs table join

Browse source
This commit is contained in:
akemidx 2023-12-18 18:26:47 -05:00
parent 05bc9f117c
commit 3fe3697a29
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/LicenseSeatsController.php
View file

@ -27,7 +27,7 @@ class LicenseSeatsController extends Controller
if ($license = License::find($licenseId)) { if ($license = License::find($licenseId)) {
$this->authorize('view', $license); $this->authorize('view', $license);
$seats = LicenseSeat::with('license', 'user', 'asset', 'user.department') $seats = LicenseSeat::with('license', 'user', 'email', 'asset', 'user.department')
->where('license_seats.license_id', $licenseId); ->where('license_seats.license_id', $licenseId);
$order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

11
app/Presenters/LicensePresenter.php
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' => '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,