lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2025-02-26 08:25:35 +00:00
commit 8bc73901cf
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/AssetModel.php
View file

@ -234,7 +234,7 @@ class AssetModel extends SnipeModel
*/ */
public function adminuser() public function adminuser()
{ {
return $this->belongsTo(\App\Models\User::class, 'created_by'); return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
} }

2
resources/views/models/view.blade.php
View file

@ -164,7 +164,7 @@
</li> </li>
@endif @endif
@if ($model->created_by) @if ($model->adminuser)
<li>{{ trans('general.created_by') }}: <li>{{ trans('general.created_by') }}:
{{ $model->adminuser->present()->name() }} {{ $model->adminuser->present()->name() }}
</li> </li>