Fix existing username validator not allowing multiple accounts (#16153)
Fix #16107
This commit is contained in:
		
							parent
							
								
									876061e777
								
							
						
					
					
						commit
						d3b2560e58
					
				
					 1 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
					@ -19,10 +19,10 @@ class ExistingUsernameValidator < ActiveModel::EachValidator
 | 
				
			||||||
      str unless Account.find_remote(username, domain)
 | 
					      str unless Account.find_remote(username, domain)
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if usernames_with_no_accounts.any? && options[:multiple]
 | 
					    if options[:multiple]
 | 
				
			||||||
      record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: usernames_with_no_accounts.join(', ')))
 | 
					      record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: usernames_with_no_accounts.join(', '))) if usernames_with_no_accounts.any?
 | 
				
			||||||
    elsif usernames_with_no_accounts.any? || usernames_and_domains.size > 1
 | 
					    else
 | 
				
			||||||
      record.errors.add(attribute, I18n.t('existing_username_validator.not_found'))
 | 
					      record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) if usernames_with_no_accounts.any? || usernames_and_domains.size > 1
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue