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

Checkin/checkout fixes

Browse source
This commit is contained in:
snipe 2020-04-21 11:28:31 -07:00
parent cff2a65f62
commit 05e9861b71
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
2 changed files with 218 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,25 +55,14 @@
<!-- Asset Name --> <!-- Asset Name -->
<!-- Only allow an asset name to be changed if the checker-outer has permission to edit the asset -->
@can('update', $asset)
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
{{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }} {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" type="text" name="name" aria-label="name" id="name" <input class="form-control" type="text" name="name" aria-label="name" id="name"
value="{{ old('name', $asset->name) }}"/>
{!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@else
@if ($asset->name!='')
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
{{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8">
<p class="form-control-static">{{ $asset->name }}</p>
</div>
</div>
@endif
@endcan
<!-- Status --> <!-- Status -->
<div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">

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

@ -51,29 +51,6 @@
{!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
@endif
<!-- Asset Name -->
<!-- Only allow an asset name to be changed if the checker-outer has permission to edit the asset -->
@can('update', $asset)
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
{{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8">
<input class="form-control" type="text" name="name" id="name" value="{{ Request::old('name', $asset->name) }}" tabindex="1">
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div>
</div>
@else
@if ($asset->name!='')
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
{{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
<div class="col-md-8">
<p class="form-control-static">{{ $asset->name }}</p>
</div>
</div>
@endif
@endcan
@include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true']) @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
@include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'required'=>'true']) @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'required'=>'true'])