DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-08-01 10:18:01 -07:00
parent d65a9091c8 139325d8ba
commit 715c9aa780
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Models/Asset.php
View file

@ -376,7 +376,10 @@ class Asset extends Depreciable
{
if ($this->name == '') {
return $this->model->name.' ('.$this->asset_tag.')';
if ($this->model) {
return $this->model->name.' ('.$this->asset_tag.')';
}
return $this->asset_tag;
} else {
return $this->name;
}

6
resources/views/dashboard.blade.php
View file

@ -120,7 +120,11 @@
<td>{{ date("M d, Y g:iA", strtotime($activity->created_at)) }}</td>
<td>
@if ($activity->action_type!='requested')
<a href="{{ route('view/user', $activity->user_id) }}">{{ $activity->adminlog->fullName() }}</a>
@if ($activity->adminlog)
<a href="{{ route('view/user', $activity->user_id) }}">{{ $activity->adminlog->fullName() }}</a>
@else
Deleted Admin
@endif
@endif
</td>