mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-28 06:59:41 -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
108 lines
3.7 KiB
PHP
Executable file
108 lines
3.7 KiB
PHP
Executable file
@extends('layouts/edit-form', [
|
|
'createText' => trans('admin/locations/table.create') ,
|
|
'updateText' => trans('admin/locations/table.update'),
|
|
'topSubmit' => true,
|
|
'helpPosition' => 'right',
|
|
'helpText' => trans('admin/locations/table.about_locations'),
|
|
'formAction' => (isset($item->id)) ? route('locations.update', ['location' => $item->id]) : route('locations.store'),
|
|
])
|
|
|
|
{{-- Page content --}}
|
|
@section('inputFields')
|
|
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/locations/table.name')])
|
|
|
|
<!-- parent -->
|
|
@include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/locations/table.parent'), 'fieldname' => 'parent_id'])
|
|
|
|
<!-- Manager-->
|
|
@include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])
|
|
|
|
<!-- Currency -->
|
|
<div class="form-group {{ $errors->has('currency') ? ' has-error' : '' }}">
|
|
<label for="currency" class="col-md-3 control-label">
|
|
{{ trans('admin/locations/table.currency') }}
|
|
</label>
|
|
<div class="col-md-9{{ (\App\Helpers\Helper::checkIfRequired($item, 'currency')) ? ' required' : '' }}">
|
|
{{ Form::text('currency', Request::old('currency', $item->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
|
|
{!! $errors->first('currency', '<span class="alert-msg">:message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
@include ('partials.forms.edit.address')
|
|
|
|
<!-- LDAP Search OU -->
|
|
@if ($snipeSettings->ldap_enabled == 1)
|
|
<div class="form-group {{ $errors->has('ldap_ou') ? ' has-error' : '' }}">
|
|
<label for="ldap_ou" class="col-md-3 control-label">
|
|
{{ trans('admin/locations/table.ldap_ou') }}
|
|
</label>
|
|
<div class="col-md-7{{ (\App\Helpers\Helper::checkIfRequired($item, 'ldap_ou')) ? ' required' : '' }}">
|
|
{{ Form::text('ldap_ou', Request::old('ldap_ou', $item->ldap_ou), array('class' => 'form-control')) }}
|
|
{!! $errors->first('ldap_ou', '<span class="alert-msg">:message</span>') !!}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
<!-- Image -->
|
|
@if ($item->image)
|
|
<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
|
|
<label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
|
|
<div class="col-md-9">
|
|
{{ Form::checkbox('image_delete') }}
|
|
<img src="{{ Storage::disk('public')->url(app('locations_upload_path').e($item->image)) }}" class="img-responsive" />
|
|
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@include ('partials.forms.edit.image-upload')
|
|
@stop
|
|
|
|
@if (!$item->id)
|
|
@section('moar_scripts')
|
|
<script nonce="{{ csrf_token() }}">
|
|
|
|
var $eventSelect = $(".parent");
|
|
$eventSelect.on("change", function () { parent_details($eventSelect.val()); });
|
|
$(function() {
|
|
var parent_loc = $(".parent option:selected").val();
|
|
if(parent_loc!=''){
|
|
parent_details(parent_loc);
|
|
}
|
|
});
|
|
|
|
function parent_details(id) {
|
|
|
|
if (id) {
|
|
//start ajax request
|
|
$.ajax({
|
|
type: 'GET',
|
|
url: "{{url('/') }}/api/locations/"+id+"/check",
|
|
//force to handle it as text
|
|
dataType: "text",
|
|
success: function(data) {
|
|
var json = $.parseJSON(data);
|
|
$("#city").val(json.city);
|
|
$("#address").val(json.address);
|
|
$("#address2").val(json.address2);
|
|
$("#state").val(json.state);
|
|
$("#zip").val(json.zip);
|
|
$(".country").select2("val",json.country);
|
|
}
|
|
});
|
|
} else {
|
|
$("#city").val('');
|
|
$("#address").val('');
|
|
$("#address2").val('');
|
|
$("#state").val('');
|
|
$("#zip").val('');
|
|
$(".country").select2("val",'');
|
|
}
|
|
|
|
|
|
|
|
};
|
|
</script>
|
|
@stop
|
|
@endif
|