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.1 KiB
PHP
23 lines
1.1 KiB
PHP
<!-- Location -->
|
|
<div id="location_id" class="form-group{{ $errors->has('location_id') ? ' has-error' : '' }}"{!! (isset($style)) ? ' style="'.e($style).'"' : '' !!}>
|
|
|
|
{{ Form::label('location_id', $translated_name, array('class' => 'col-md-3 control-label')) }}
|
|
<div class="col-md-7">
|
|
<select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="location_id" style="width: 100%" id="location_id_location_select">
|
|
@if ($location_id = Request::old('location_id', (isset($user)) ? $user->location_id : ''))
|
|
<option value="{{ $location_id }}" selected="selected">
|
|
{{ (\App\Models\Location::find($location_id)) ? \App\Models\Location::find($location_id)->name : '' }}
|
|
</option>
|
|
@else
|
|
<option value="">{{ trans('general.select_location') }}</option>
|
|
@endif
|
|
</select>
|
|
</div>
|
|
|
|
{!! $errors->first('location_id', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times"></i> :message</span></div>') !!}
|
|
|
|
</div>
|
|
|
|
|
|
|