DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-08-02 04:46:25 -07:00
parent 846356974d cbc42f3e59
commit 95328f0a6a
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -152,6 +152,8 @@
<a href="{{ route('view/component', $activity->component_id) }}">{{ $activity->componentlog->name }}</a> <a href="{{ route('view/component', $activity->component_id) }}">{{ $activity->componentlog->name }}</a>
@elseif (($activity->assetlog) && ($activity->action_type=="uploaded")) @elseif (($activity->assetlog) && ($activity->action_type=="uploaded"))
<a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a> <a href="{{ route('view/hardware', $activity->asset_id) }}">{{ $activity->assetlog->showAssetName() }}</a>
@elseif (($activity->userlog) && ($activity->action_type=="uploaded"))
<a href="{{ route('view/user', $activity->asset_id) }}">{{ $activity->userlog->fullName() }}</a>
@else @else
{{ trans('general.bad_data') }} {{ trans('general.bad_data') }}
@endif @endif

13
resources/views/users/view.blade.php
View file

@ -442,7 +442,18 @@
@endif @endif
</td> </td>
<td>{{ $log->adminlog->fullName() }}</td> <td>@if ($log->adminlog)
@if ($log->adminlog->deleted_at=='')
<a href="{{ route('view/user', $log->checkedout_to) }}">
{{ $log->adminlog->fullName() }}
</a>
@else
<del>{{ $log->adminlog->fullName() }}</del>
@endif
@else
Deleted User
@endif</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>