mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
Merge pull request #11960 from snipe/fixes/better_validation_for_ldap_filter
Sets nullable attribute on validation
This commit is contained in:
commit
cd43fc50fb
|
@ -923,8 +923,8 @@ class SettingsController extends Controller
|
||||||
|
|
||||||
$validator = Validator::make($setting->toArray(), [
|
$validator = Validator::make($setting->toArray(), [
|
||||||
'ldap_username_field' => 'not_in:sAMAccountName',
|
'ldap_username_field' => 'not_in:sAMAccountName',
|
||||||
'ldap_auth_filter_query' => 'not_in:uid=samaccountname',
|
'ldap_auth_filter_query' => 'not_in:uid=samaccountname|required_if:ldap_enabled,1',
|
||||||
'ldap_filter' => 'regex:"^[^(]"',
|
'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1',
|
||||||
], $messages);
|
], $messages);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue