mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-11 08:04:09 -08:00
296de34e8a
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials
48 lines
2.5 KiB
PHP
48 lines
2.5 KiB
PHP
<div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
|
|
{{ Form::label('address', trans('general.address'), array('class' => 'col-md-3 control-label')) }}
|
|
<div class="col-md-7">
|
|
{{Form::text('address', Request::old('address', $item->address), array('class' => 'form-control')) }}
|
|
{!! $errors->first('address', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group {{ $errors->has('address2') ? ' has-error' : '' }}">
|
|
{{ Form::label('address2', ' ', array('class' => 'col-md-3 control-label')) }}
|
|
<div class="col-md-7">
|
|
{{Form::text('address2', Request::old('address2', $item->address2), array('class' => 'form-control')) }}
|
|
{!! $errors->first('address2', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
|
|
{{ Form::label('city', trans('general.city'), array('class' => 'col-md-3 control-label')) }}
|
|
<div class="col-md-7">
|
|
{{Form::text('city', Request::old('city', $item->city), array('class' => 'form-control')) }}
|
|
{!! $errors->first('city', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
|
|
{{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label')) }}
|
|
<div class="col-md-7">
|
|
{{Form::text('state', Request::old('state', $item->state), array('class' => 'form-control')) }}
|
|
{!! $errors->first('state', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
|
|
{{ Form::label('country', trans('general.country'), array('class' => 'col-md-3 control-label')) }}
|
|
<div class="col-md-5">
|
|
{!! Form::countries('country', Request::old('country', $item->country), 'select2') !!}
|
|
{!! $errors->first('country', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
|
|
{{ Form::label('zip', trans('general.zip'), array('class' => 'col-md-3 control-label')) }}
|
|
<div class="col-md-7">
|
|
{{Form::text('zip', Request::old('zip', $item->zip), array('class' => 'form-control')) }}
|
|
{!! $errors->first('zip', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|