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

Fixed broken if/else in view from bad merge

Browse source
This commit is contained in:
snipe 2020-04-21 11:13:29 -07:00
parent 7a6ca5cb40
commit cff2a65f62
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
1 changed files with 1008 additions and 1017 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/views/hardware/view.blade.php
View file

@ -58,7 +58,6 @@
</a> </a>
</li> </li>
@endcan @endcan
<li role="presentation"><a href="{{ route('label/hardware', $asset->id) }}">{{ trans_choice('button.generate_labels', 1) }}</a></li>
</ul> </ul>
</div> </div>
@endcan @endcan
@ -360,7 +359,6 @@
</div> </div>
</div> </div>
@if ($asset->model) @if ($asset->model)
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
@ -395,7 +393,6 @@
</div> </div>
</div> </div>
@if (($asset->model) && ($asset->model->fieldset)) @if (($asset->model) && ($asset->model->fieldset))
@foreach($asset->model->fieldset->fields as $field) @foreach($asset->model->fieldset->fields as $field)
<div class="row"> <div class="row">
@ -463,10 +460,10 @@
@endif @endif
{{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost)}} {{ \App\Helpers\Helper::formatCurrencyOutput($asset->purchase_cost)}}
</div> </div>
</div> </div>
@endif @endif
@if ($asset->order_number) @if ($asset->order_number)
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
@ -582,12 +579,9 @@
{{ $asset->present()->months_until_eol()->m }} {{ $asset->present()->months_until_eol()->m }}
{{ trans('general.months') }} {{ trans('general.months') }}
)
@endif
@endif @endif
</div> </div>
</div> </div>
@endif @endif
@ -717,7 +711,7 @@
</div> </div>
</div> <!-- end row-striped --> </div> <!-- end row-striped -->
</div> <!-- /table-responsive -->
</div><!-- /col-md-8 --> </div><!-- /col-md-8 -->
<div class="col-md-4"> <div class="col-md-4">
@ -725,13 +719,13 @@
@if ($asset->image) @if ($asset->image)
<div class="col-md-12 text-center" style="padding-bottom: 15px;"> <div class="col-md-12 text-center" style="padding-bottom: 15px;">
<a href="{{ url('/') }}/uploads/assets/{{ $asset->image }}" data-toggle="lightbox"> <a href="{{ url('/') }}/uploads/assets/{{ $asset->image }}" data-toggle="lightbox">
<img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($asset->image)) }}" class="assetimg img-responsive"> <img src="{{ url('/') }}/uploads/assets/{{{ $asset->image }}}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
</a> </a>
</div> </div>
@elseif (($asset->model) && ($asset->model->image!='')) @elseif (($asset->model) && ($asset->model->image!=''))
<div class="col-md-12 text-center" style="padding-bottom: 15px;"> <div class="col-md-12 text-center" style="padding-bottom: 15px;">
<a href="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" data-toggle="lightbox"> <a href="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" data-toggle="lightbox">
<img src="{{ Storage::disk('public')->url(app('models_upload_url').e($asset->model->image )) }}" class="assetimg img-responsive"> <img src="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
</a> </a>
</div> </div>
@endif @endif
@ -1004,10 +998,9 @@
<th data-field="icon" data-visible="true" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"><span class="sr-only">Icon</span></th> <th data-field="icon" data-visible="true" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"><span class="sr-only">Icon</span></th>
<th class="col-sm-2" data-visible="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th> <th class="col-sm-2" data-visible="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
<th class="col-sm-1" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th> <th class="col-sm-1" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
<th class="col-sm-2" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
<th class="col-sm-1" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th> <th class="col-sm-1" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
<th class="col-sm-2" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
<th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th> <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
<th class="col-sm-2" data-visible="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
<th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</th> <th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</th>
@if ($snipeSettings->require_accept_signature=='1') @if ($snipeSettings->require_accept_signature=='1')
<th class="col-md-3" data-field="signature_file" data-visible="false" data-formatter="imageFormatter">{{ trans('general.signature') }}</th> <th class="col-md-3" data-field="signature_file" data-visible="false" data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
@ -1085,7 +1078,7 @@
<td> <td>
@if ($file->created_at) @if ($file->created_at)
{{ \App\Helpers\Helper::getFormattedDateObject($file->created_at, 'datetime', false) }} {{ \App\Helpers\Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
@endif @endif
</td> </td>
@ -1097,8 +1090,6 @@
</td> </td>
</tr> </tr>
@endforeach @endforeach
@endif
</tbody> </tbody>
</table> </table>