DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-01-19 18:17:38 -08:00
parent cbca126d9d 782813ab49
commit 05bc238c9a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/accessories/checkout.blade.php
View file

@ -53,7 +53,7 @@
@include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to']) @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to'])
@if ($accessory->category->require_acceptance=='1') @if (($accessory->category) && ($accessory->category->require_acceptance=='1'))
<div class="form-group"> <div class="form-group">
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
<p class="hint-block">{{ trans('admin/categories/general.required_acceptance') }}</p> <p class="hint-block">{{ trans('admin/categories/general.required_acceptance') }}</p>