ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix data in view model

Browse Source
This commit is contained in:
Godfrey M
2025-09-23 12:50:26 -07:00
parent 5af85bfe7d
commit 6f3323c195
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Checkoutable.php
+14 -6
View File
@@ -52,14 +52,22 @@ class Checkoutable
}
if($unaccepted_row instanceof LicenseSeat){
$category = '';
$category = optional($unaccepted_row->license->category?->present())->nameUrl() ?? '';
$company = optional($unaccepted_row->license->company?->present())?->nameUrl() ?? '';
$model = '';
$name = $unaccepted_row->license->name ?? '';
}
if($unaccepted_row instanceof Consumable){
$category = optional($unaccepted_row->category?->present())->nameUrl() ?? '';
$model = $unaccepted_row->model_number ?? '';
$name = $unaccepted_row?->present()?->nameUrl() ?? '';
}
if($unaccepted_row instanceof Component){
$category = optional($unaccepted_row->category?->present())->nameUrl() ?? '';
$model = $unaccepted_row->model_number ?? '';
$name = $unaccepted_row->present()->nameUrl() ?? '';
$name = $unaccepted_row?->present()?->nameUrl() ?? '';
}
$created = $acceptance->created_at;
@@ -74,10 +82,10 @@ class Checkoutable
acceptance: $acceptance,
assignee: $assignee,
//plain text for CSVs
category_plain: optional($unaccepted_row->model?->category)->name ?? '',
model_plain: optional($unaccepted_row->model)->name ?? '',
name_plain: (string) ($unaccepted_row->name ?? ''),
company_plain: optional($unaccepted_row->company)->name ?? '',
category_plain: ($unaccepted_row->model?->category?->name ?? $unaccepted_row->license->category?->name ?? $unaccepted_row->category?->name ?? ''),
model_plain: ($unaccepted_row->model?->name ?? $unaccepted_row->model_number ?? ''),
name_plain: ($unaccepted_row->name ?? $unaccepted_row->license?->name ?? ''),
company_plain: ($unaccepted_row->company)->name ?? $unaccepted_row->license->company?->name ?? '',
);
}
}
resources/views/reports/unaccepted_assets.blade.php
+1 -1
View File
@@ -70,7 +70,7 @@
{{-- Item Type --}}
<td>{{ $item->type }}</td>
{{-- Company name --}}
<td>{!! $item->company !!}/td>
<td>{!! $item->company !!}</td>
{{-- Category --}}
<td>{!! $item->category !!}</td>