Merge pull request #9809 from uberbrady/fix_saml_custom_settings

The custom settings section of SAML sometimes has bad linefeeds
This commit is contained in:
snipe 2021-07-08 17:16:37 -07:00 committed by GitHub
commit b307d2858c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -157,9 +157,7 @@
{{ Form::label('saml_custom_settings', trans('admin/settings/general.saml_custom_settings')) }} {{ Form::label('saml_custom_settings', trans('admin/settings/general.saml_custom_settings')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::textarea('saml_custom_settings', old('saml_custom_settings', $setting->saml_custom_settings), ['class' => 'form-control','placeholder' => 'example.option=false {{ Form::textarea('saml_custom_settings', old('saml_custom_settings', $setting->saml_custom_settings), ['class' => 'form-control','placeholder' => 'example.option=false&#13;&#10;sp_x509cert=file:///...&#13;&#10;sp_private_key=file:///', 'wrap' => 'off', $setting->demoMode]) }}
sp_x509cert=file:///...
sp_private_key=file:///', 'wrap' => 'off', $setting->demoMode]) }}
<p class="help-block">{{ trans('admin/settings/general.saml_custom_settings_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.saml_custom_settings_help') }}</p>
{!! $errors->first('saml_custom_settings', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('saml_custom_settings', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>