mirror of
https://github.com/snipe/snipe-it.git
synced 2024-10-03 14:17:34 -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
119 lines
4.5 KiB
PHP
Executable file
119 lines
4.5 KiB
PHP
Executable file
@extends('layouts/edit-form', [
|
|
'createText' => trans('admin/categories/general.create') ,
|
|
'updateText' => trans('admin/categories/general.update'),
|
|
'helpPosition' => 'right',
|
|
'helpText' => trans('help.categories'),
|
|
'formAction' => (isset($item->id)) ? route('categories.update', ['category' => $item->id]) : route('categories.store'),
|
|
])
|
|
|
|
@section('inputFields')
|
|
|
|
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/categories/general.name')])
|
|
|
|
<!-- Type -->
|
|
<div class="form-group {{ $errors->has('category_type') ? ' has-error' : '' }}">
|
|
<label for="category_type" class="col-md-3 control-label">{{ trans('general.type') }}</label>
|
|
<div class="col-md-7 required">
|
|
{{ Form::select('category_type', $category_types , Request::old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', $item->itemCount() > 0 ? 'disabled' : '')) }}
|
|
{!! $errors->first('category_type', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<!-- EULA text -->
|
|
<div class="form-group {{ $errors->has('eula_text') ? 'error' : '' }}">
|
|
<label for="eula_text" class="col-md-3 control-label">{{ trans('admin/categories/general.eula_text') }}</label>
|
|
<div class="col-md-7">
|
|
{{ Form::textarea('eula_text', Request::old('eula_text', $item->eula_text), array('class' => 'form-control')) }}
|
|
<p class="help-block">{!! trans('admin/categories/general.eula_text_help') !!} </p>
|
|
<p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!} </p>
|
|
|
|
{!! $errors->first('eula_text', '<span class="alert-msg">:message</span>') !!}
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Use default checkbox -->
|
|
<div class="form-group">
|
|
<div class="col-md-3">
|
|
</div>
|
|
<div class="col-md-9">
|
|
@if ($snipeSettings->default_eula_text!='')
|
|
{{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['class'=>'minimal']) }}
|
|
{!! trans('admin/categories/general.use_default_eula') !!}
|
|
@else
|
|
<div class="icheckbox disabled">
|
|
{{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled minimal','disabled' => 'disabled']) }}
|
|
|
|
{!! trans('admin/categories/general.use_default_eula_disabled') !!}
|
|
</div>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<!-- Require Acceptance -->
|
|
<div class="form-group">
|
|
<div class="col-md-3">
|
|
</div>
|
|
<div class="col-md-9">
|
|
{{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['class'=>'minimal']) }}
|
|
{{ trans('admin/categories/general.require_acceptance') }}
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<!-- Email on Checkin -->
|
|
<div class="form-group">
|
|
<div class="col-md-3">
|
|
</div>
|
|
<div class="col-md-9">
|
|
{{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['class'=>'minimal']) }}
|
|
{{ trans('admin/categories/general.checkin_email') }}
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<!-- 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('categories_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
|
|
|
|
@section('content')
|
|
@parent
|
|
|
|
|
|
@if ($snipeSettings->default_eula_text!='')
|
|
<!-- Modal -->
|
|
<div class="modal fade" id="eulaModal" tabindex="-1" role="dialog" aria-labelledby="eulaModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
|
<h4 class="modal-title" id="eulaModalLabel">{{ trans('admin/settings/general.default_eula_text') }}</h4>
|
|
</div>
|
|
<div class="modal-body">
|
|
{{ \App\Models\Setting::getDefaultEula() }}
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
|
|
|
|
@stop
|