mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 06:04:08 -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
78 lines
4 KiB
PHP
78 lines
4 KiB
PHP
@if (($model) && ($model->fieldset))
|
|
@foreach($model->fieldset->fields AS $field)
|
|
<div class="form-group{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">
|
|
<label for="{{ $field->db_column_name() }}" class="col-md-3 control-label">{{ $field->name }} </label>
|
|
<div class="col-md-7 col-sm-12{{ ($field->pivot->required=='1') ? ' required' : '' }}">
|
|
|
|
|
|
@if ($field->element!='text')
|
|
<!-- Listbox -->
|
|
@if ($field->element=='listbox')
|
|
{{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
|
|
Request::old($field->db_column_name(),(isset($item) ? $item->{$field->db_column_name()} : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
|
|
|
|
@elseif ($field->element=='textarea')
|
|
<textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ Request::old($field->db_column_name(),(isset($item) ? $item->{$field->db_column_name()} : $field->defaultValue($model->id))) }}</textarea>
|
|
|
|
|
|
@elseif ($field->element=='checkbox')
|
|
<!-- Checkboxes -->
|
|
@foreach ($field->formatFieldValuesAsArray() as $key => $value)
|
|
|
|
<div>
|
|
<label>
|
|
<input type="checkbox" value="1" name="{{ $field->db_column_name() }}[]" class="minimal" {{ Request::old($field->db_column_name()) != '' ? ' checked="checked"' : '' }}> key: {{ $key }} value: {{ $value }}
|
|
</label>
|
|
</div>
|
|
@endforeach
|
|
|
|
@endif
|
|
|
|
|
|
@else
|
|
<!-- Date field -->
|
|
|
|
@if ($field->format=='DATE')
|
|
|
|
<div class="input-group col-md-4" style="padding-left: 0px;">
|
|
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
|
|
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" value="{{ Request::old($field->db_column_name(),(isset($item) ? \App\Helpers\Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : "")) }}">
|
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@else
|
|
@if (($field->field_encrypted=='0') || (Gate::allows('admin')))
|
|
<input type="text" value="{{ Request::old($field->db_column_name(),(isset($item) ? \App\Helpers\Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text">
|
|
@else
|
|
<input type="text" value="{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}" class="form-control disabled" disabled>
|
|
@endif
|
|
@endif
|
|
|
|
@endif
|
|
|
|
@if ($field->help_text!='')
|
|
<p class="help-block">{{ $field->help_text }}</p>
|
|
@endif
|
|
|
|
<?php
|
|
$errormessage=$errors->first($field->db_column_name());
|
|
if ($errormessage) {
|
|
$errormessage=preg_replace('/ snipeit /', '', $errormessage);
|
|
print('<span class="alert-msg"><i class="fa fa-times"></i> '.$errormessage.'</span>');
|
|
}
|
|
?>
|
|
</div>
|
|
|
|
@if ($field->field_encrypted)
|
|
<div class="col-md-1 col-sm-1 text-left">
|
|
<i class="fa fa-lock" data-toggle="tooltip" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}"></i>
|
|
</div>
|
|
@endif
|
|
|
|
|
|
</div>
|
|
@endforeach
|
|
@endif
|