DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -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 2021-05-05 10:29:10 -07:00
parent aa98e4ea7a ece627b3a3
commit 570a31a1c4
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/img/demo/favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

20
resources/views/locations/print.blade.php
View file

@ -84,11 +84,11 @@
<tr>
<td>{{ $counter }}</td>
<td>{{ $user->company->name }}</td>
<td>{{ $user->first_name }} {{ $user->last_name }}</td>
<td>{{ $user->employee_num }}</td>
<td>{{ $user->department->name }}</td>
<td>{{ $user->location->name }}</td>
<td>{{ (($user) && ($user->company)) ? $user->company->name : '' }}</td>
<td>{{ ($user) ? $user->first_name .' '. $user->last_name : '' }}</td>
<td>{{ ($user) ? $user->employee_num : '' }}</td>
<td>{{ (($user) && ($user->department)) ? $user->department->name : '' }}</td>
<td>{{ (($user) && ($user->location)) ? $user->location->name : '' }}</td>
</tr>
@php
$counter++
@ -131,11 +131,11 @@
<td>{{ $counter }}</td>
<td>{{ $asset->asset_tag }}</td>
<td>{{ $asset->name }}</td>
<td>{{ $asset->model->category->name }}</td>
<td>{{ $asset->model->manufacturer->name }}</td>
<td>{{ $asset->model->name }} {{ $asset->model->model_number }}</td>
<td>{{ $asset->serial }}</td>
<td>{{ $asset->location->name }}</td>
<td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : '' }}</td>
<td>{{ (($asset->model) && ($asset->model->manufacturer)) ? $asset->model->manufacturer->name : '' }}</td>
<td>{{ ($asset->model) ? $asset->model->name : '' }}</td>
<td>{{ $asset->serial }}</td>
<td>{{ $asset->location->name }}</td>
<td>{{ $asset->last_checkout }}</td>
<td>{{ $asset->expected_checkin }}</td>
</tr>

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

@ -248,10 +248,14 @@
</tr>
@endif
@if (!is_null($user->department))
@if ($user->department)
<tr>
<td class="text-nowrap">{{ trans('general.department') }}</td>
<td><a href="{{ route('departments.show', $user->department) }}">{{ $user->department->name }}</a></td>
<td>
<a href="{{ route('departments.show', $user->department) }}">
{{ $user->department->name }}
</a>
</td>
</tr>
@endif
@if ($user->created_at)