Some model/manufacturer cleanup

This commit is contained in:
snipe 2017-03-11 08:53:02 -08:00
parent 2c3b9426fe
commit a4697f046e

View file

@ -50,9 +50,8 @@
data-cookie-id-table="modeldetailsViewTable"> data-cookie-id-table="modeldetailsViewTable">
<thead> <thead>
<tr> <tr>
<th data-sortable="false" data-field="company" data-searchable="false" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('admin/companies/table.title') }}</th>
<th data-sortable="true" data-field="id" data-searchable="false" data-visible="false">{{ trans('general.id') }}</th> <th data-sortable="true" data-field="id" data-searchable="false" data-visible="false">{{ trans('general.id') }}</th>
<th data-sortable="false" data-field="company" data-searchable="false" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('admin/companies/table.title') }}</th>
<th data-sortable="true" data-field="name" data-searchable="true" data-formatter="hardwareLinkFormatter">{{ trans('general.name') }}</th> <th data-sortable="true" data-field="name" data-searchable="true" data-formatter="hardwareLinkFormatter">{{ trans('general.name') }}</th>
<th data-sortable="true" data-field="asset_tag" data-formatter="hardwareLinkFormatter">{{ trans('general.asset_tag') }}</th> <th data-sortable="true" data-field="asset_tag" data-formatter="hardwareLinkFormatter">{{ trans('general.asset_tag') }}</th>
<th data-sortable="true" data-field="serial" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/table.serial') }}</th> <th data-sortable="true" data-field="serial" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/table.serial') }}</th>
@ -73,9 +72,38 @@
@if ($model->manufacturer) @if ($model->manufacturer)
<li> <li>
{{ trans('general.manufacturer') }}: {{ trans('general.manufacturer') }}:
{{ $model->manufacturer->name }} @can('view', \App\Models\Manufacturer::class)
<a href="{{ route('manufacturers.show', $model->manufacturer->id) }}">
{{ $model->manufacturer->name }}
</a>
@else
{{ $model->manufacturer->name }}
@endcan
</li> </li>
@endif @endif
@if ($model->manufacturer->url)
<li>
<i class="fa fa-globe"></i> <a href="{{ $model->manufacturer->url }}">{{ $model->manufacturer->url }}</a>
</li>
@endif
@if ($model->manufacturer->support_url)
<li>
<i class="fa fa-life-ring"></i> <a href="{{ $model->manufacturer->support_url }}">{{ $model->manufacturer->support_url }}</a>
</li>
@endif
@if ($model->manufacturer->support_phone)
<li>
<i class="fa fa-phone"></i> {{ $model->manufacturer->support_phone }}
</li>
@endif
@if ($model->manufacturer->support_email)
<li>
<i class="fa fa-envelope"></i> <a href="mailto:{{ $model->manufacturer->support_email }}">{{ $model->manufacturer->support_email }}</a>
</li>
@endif
@if ($model->model_number) @if ($model->model_number)
<li> <li>
@ -93,7 +121,7 @@
@if ($model->eol) @if ($model->eol)
<li>{{ trans('general.eol') }}: <li>{{ trans('general.eol') }}:
{{ $model->eol .' '. trans('general.months') }} {{ trans('general.months') }} {{ $model->eol .' '. trans('general.months') }}
</li> </li>
@endif @endif