mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-28 23:19:42 -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
197 lines
7.9 KiB
PHP
197 lines
7.9 KiB
PHP
@php
|
|
use App\Models\CustomField;
|
|
@endphp
|
|
|
|
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
{{ trans('admin/custom_fields/general.custom_fields') }}
|
|
@parent
|
|
@stop
|
|
|
|
@section('content')
|
|
|
|
@section('header_right')
|
|
<a href="{{ route('fields.index') }}" class="btn btn-primary pull-right">
|
|
{{ trans('general.back') }}</a>
|
|
@stop
|
|
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
|
|
<div class="row">
|
|
<div class="col-md-9">
|
|
<!-- Horizontal Form -->
|
|
@if ($field->id)
|
|
{{ Form::open(['route' => ['fields.update', $field->id], 'class'=>'form-horizontal']) }}
|
|
{{ method_field('PUT') }}
|
|
@else
|
|
{{ Form::open(['route' => 'fields.store', 'class'=>'form-horizontal']) }}
|
|
@endif
|
|
|
|
<div class="box box-default">
|
|
<div class="box-body">
|
|
<!-- Name -->
|
|
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
|
|
<label for="name" class="col-md-4 control-label">
|
|
{{ trans('admin/custom_fields/general.field_name') }}
|
|
</label>
|
|
<div class="col-md-6 required">
|
|
{{ Form::text('name', Request::old('name', $field->name), array('class' => 'form-control')) }}
|
|
{!! $errors->first('name', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Element Type -->
|
|
<div class="form-group {{ $errors->has('element') ? ' has-error' : '' }}">
|
|
<label for="element" class="col-md-4 control-label">
|
|
{{ trans('admin/custom_fields/general.field_element') }}
|
|
</label>
|
|
<div class="col-md-6 required">
|
|
|
|
{!! Form::customfield_elements('element', Request::old('element', $field->element), 'field_element select2 form-control') !!}
|
|
{!! $errors->first('element', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Element values -->
|
|
<div class="form-group {{ $errors->has('element') ? ' has-error' : '' }}" id="field_values_text" style="display:none;">
|
|
<label for="field_values" class="col-md-4 control-label">
|
|
{{ trans('admin/custom_fields/general.field_values') }}
|
|
</label>
|
|
<div class="col-md-6 required">
|
|
{!! Form::textarea('field_values', Request::old('name', $field->field_values), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control']) !!}
|
|
{!! $errors->first('field_values', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
<p class="help-block">{{ trans('admin/custom_fields/general.field_values_help') }}</p>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Format -->
|
|
<div class="form-group {{ $errors->has('format') ? ' has-error' : '' }}">
|
|
<label for="format" class="col-md-4 control-label">
|
|
{{ trans('admin/custom_fields/general.field_format') }}
|
|
</label>
|
|
<div class="col-md-6 required">
|
|
{{ Form::select("format",$predefinedFormats, $field->getFormatType(),
|
|
array('class'=>'format select2 form-control')) }}
|
|
{!! $errors->first('format', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
<!-- Custom Format -->
|
|
<div class="form-group {{ $errors->has('custom_format') ? ' has-error' : '' }}" id="custom_regex" style="display:none;">
|
|
<label for="custom_format" class="col-md-4 control-label">
|
|
{{ trans('admin/custom_fields/general.field_custom_format') }}
|
|
</label>
|
|
<div class="col-md-6 required">
|
|
{{ Form::text('custom_format', Request::old('custom_format', $customFormat), array('class' => 'form-control', 'id' => 'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }}
|
|
<p class="help-block">{!! trans('admin/custom_fields/general.field_custom_format_help') !!}</p>
|
|
|
|
{!! $errors->first('custom_format', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Help Text -->
|
|
<div class="form-group {{ $errors->has('help_text') ? ' has-error' : '' }}">
|
|
<label for="help_text" class="col-md-4 control-label">
|
|
Help Text
|
|
</label>
|
|
<div class="col-md-6">
|
|
{{ Form::text('help_text', Request::old('help_text', $field->help_text), array('class' => 'form-control')) }}
|
|
<p class="help-block">This is optional text that will appear below the form elements while editing an asset to provide context on the field.</p>
|
|
{!! $errors->first('help_text', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Show in Email -->
|
|
<div class="form-group {{ $errors->has('show_in_email') ? ' has-error' : '' }}" id="show_in_email">
|
|
<div class="col-md-8 col-md-offset-4">
|
|
<label for="show_in_email">
|
|
<input type="checkbox" name="show_in_email" value="1" class="minimal"{{ (Request::old('show_in_email') || $field->show_in_email) ? ' checked="checked"' : '' }}>
|
|
{{ trans('admin/custom_fields/general.show_in_email') }}
|
|
</label>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
@if (!$field->id)
|
|
<!-- Encrypted -->
|
|
<div class="form-group {{ $errors->has('encrypted') ? ' has-error' : '' }}">
|
|
<div class="col-md-8 col-md-offset-4">
|
|
<label for="field_encrypted">
|
|
<input type="checkbox" value="1" name="field_encrypted" id="field_encrypted" class="minimal"{{ (Request::old('field_encrypted') || $field->field_encrypted) ? ' checked="checked"' : '' }}>
|
|
{{ trans('admin/custom_fields/general.encrypt_field') }}
|
|
</label>
|
|
</div>
|
|
|
|
<div class="col-md-6 col-md-offset-4" id="encrypt_warning" style="display:none;">
|
|
<div class="callout callout-danger">
|
|
<p><i class="fa fa-warning"></i> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
</div> <!-- /.box-body-->
|
|
|
|
<div class="box-footer text-right">
|
|
<button type="submit" class="btn btn-success"> {{ trans('general.save') }}</button>
|
|
</div>
|
|
|
|
</div> <!--.box.box-default-->
|
|
|
|
{{ Form::close() }}
|
|
</div> <!--/.col-md-9-->
|
|
|
|
<div class="col-md-3">
|
|
<h4>About Custom Fields</h4>
|
|
<p>Custom fields allow you to add arbitrary attributes to assets.</p>
|
|
</div>
|
|
|
|
</div>
|
|
@stop
|
|
|
|
@section('moar_scripts')
|
|
<script nonce="{{ csrf_token() }}">
|
|
$(document).ready(function(){
|
|
// Only display the custom format field if it's a custom format validation type
|
|
$(".format").change(function(){
|
|
$(this).find("option:selected").each(function(){
|
|
if ($('.format').prop("selectedIndex") == 1) {
|
|
$("#custom_regex").show();
|
|
} else{
|
|
$("#custom_regex").hide();
|
|
}
|
|
});
|
|
}).change();
|
|
|
|
// Only display the field element if the type is not text
|
|
$(".field_element").change(function(){
|
|
$(this).find("option:selected").each(function(){
|
|
if (($(this).attr("value")!="text") && ($(this).attr("value")!="textarea")){
|
|
$("#field_values_text").show();
|
|
} else{
|
|
$("#field_values_text").hide();
|
|
}
|
|
});
|
|
}).change();
|
|
});
|
|
|
|
// Checkbox handling
|
|
$('#field_encrypted').on('ifChecked', function(event){
|
|
$("#encrypt_warning").show();
|
|
$("#show_in_email").hide();
|
|
});
|
|
|
|
$('#field_encrypted').on('ifUnchecked', function(event){
|
|
$("#encrypt_warning").hide();
|
|
$("#show_in_email").show();
|
|
});
|
|
|
|
</script>
|
|
@stop
|