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

note field optional

Browse source
This commit is contained in:
akemidx 2024-08-01 17:02:35 -04:00
parent 3ff1745f56
commit 0f0baa207d
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
resources/views/hardware/checkin.blade.php
View file

@ -113,17 +113,25 @@
</div> </div>
</div> </div>
<!-- Note --> <!-- Note -->
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
<label for="note" class="col-sm-3 control-label"> <label for="note" class="col-md-3 control-label">
{{ trans('general.notes') }} {{ trans('general.notes') }}
</label> </label>
<div class="col-md-8"> @if($snipeSettings->require_checkinout_notes=="1")
<textarea class="col-md-6 form-control" id="note" required="true" <div class="col-md-8">
name="note">{{ old('note', $asset->note) }}</textarea> <textarea class="col-md-6 form-control" id="note" required="true"
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!} name="note">{{ old('note', $asset->note) }}</textarea>
</div> {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
@else
<div class="col-md-8">
<textarea class="col-md-6 form-control" id="note"
name="note">{{ old('note', $asset->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
@endif
</div>
</div> <!--/.box-body--> </div> <!--/.box-body-->
</div> <!--/.box-body--> </div> <!--/.box-body-->

8
resources/views/hardware/checkout.blade.php
View file

@ -140,11 +140,19 @@
<label for="note" class="col-md-3 control-label"> <label for="note" class="col-md-3 control-label">
{{ trans('general.notes') }} {{ trans('general.notes') }}
</label> </label>
@if($snipeSettings->require_checkinout_notes=="1")
<div class="col-md-8"> <div class="col-md-8">
<textarea class="col-md-6 form-control" id="note" required="true" <textarea class="col-md-6 form-control" id="note" required="true"
name="note">{{ old('note', $asset->note) }}</textarea> name="note">{{ old('note', $asset->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
@else
<div class="col-md-8">
<textarea class="col-md-6 form-control" id="note"
name="note">{{ old('note', $asset->note) }}</textarea>
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
@endif
</div> </div>
@if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!='')) @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))