mirror of
https://github.com/snipe/snipe-it.git
synced 2024-10-03 22:27:37 -07: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
23 lines
1.3 KiB
PHP
23 lines
1.3 KiB
PHP
<!-- Status -->
|
|
<div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
|
|
<label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
|
|
<div class="col-md-7 col-sm-11{{ (\App\Helpers\Helper::checkIfRequired($item, 'status_id')) ? ' required' : '' }}">
|
|
{{ Form::select('status_id', $statuslabel_list , Request::old('status_id', $item->status_id), ['class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id', 'placeholder' => trans('general.select_statuslabel'), 'required' => true, 'data-validation' => 'required']) }}
|
|
{!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
<div class="col-md-2 col-sm-2 text-left">
|
|
|
|
@can('create', \App\Models\Statuslabel::class)
|
|
<a href='{{ route('modal.statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-default">New</a>
|
|
@endcan
|
|
|
|
<span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
|
|
|
|
</div>
|
|
|
|
<div class="col-md-7 col-sm-11 col-md-offset-3" id="status_helptext">
|
|
<p id="selected_status_status" style="display:none;"></p>
|
|
</div>
|
|
|
|
</div>
|