mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Fixed missing break that would override password requirement
This commit is contained in:
parent
2b45433255
commit
8a9960f830
|
@ -27,15 +27,17 @@ class SaveUserRequest extends Request
|
||||||
|
|
||||||
$rules = [];
|
$rules = [];
|
||||||
|
|
||||||
|
\Log::debug($this->method());
|
||||||
switch($this->method())
|
switch($this->method())
|
||||||
{
|
{
|
||||||
|
|
||||||
// Brand new asset
|
// Brand new user
|
||||||
case 'POST':
|
case 'POST':
|
||||||
{
|
{
|
||||||
$rules['first_name'] = 'required|string|min:1';
|
$rules['first_name'] = 'required|string|min:1';
|
||||||
$rules['username'] = 'required_unless:ldap_import,1|string|min:1';
|
$rules['username'] = 'required_unless:ldap_import,1|string|min:1';
|
||||||
$rules['password'] = Setting::passwordComplexityRulesSaving('store');
|
$rules['password'] = Setting::passwordComplexityRulesSaving('store');
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save all fields
|
// Save all fields
|
||||||
|
@ -43,11 +45,13 @@ class SaveUserRequest extends Request
|
||||||
$rules['first_name'] = 'required|string|min:1';
|
$rules['first_name'] = 'required|string|min:1';
|
||||||
$rules['username'] = 'required_unless:ldap_import,1|string|min:1';
|
$rules['username'] = 'required_unless:ldap_import,1|string|min:1';
|
||||||
$rules['password'] = Setting::passwordComplexityRulesSaving('update');
|
$rules['password'] = Setting::passwordComplexityRulesSaving('update');
|
||||||
|
break;
|
||||||
|
|
||||||
// Save only what's passed
|
// Save only what's passed
|
||||||
case 'PATCH':
|
case 'PATCH':
|
||||||
{
|
{
|
||||||
$rules['password'] = Setting::passwordComplexityRulesSaving('update');
|
$rules['password'] = Setting::passwordComplexityRulesSaving('update');
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
default:break;
|
default:break;
|
||||||
|
|
Loading…
Reference in a new issue