github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3135 from longhotsummer/fix-no-user-params

Browse Source 
FIX: creating a user shouldn't error when optional fields aren't given
This commit is contained in:
Sam
2015-01-30 10:12:57 +11:00
parent 67b262b93e d99ccf6d27
commit ea7af7a83b
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/controllers/users_controller.rb
View File

@ -213,20 +213,19 @@ class UsersController < ApplicationController
# Handle custom fields
user_fields = UserField.all
if user_fields.present?
if params[:user_fields].blank? && UserField.where(required: true).exists?
return fail_with("login.missing_user_field")
else
fields = user.custom_fields
user_fields.each do |f|
field_val = params[:user_fields][f.id.to_s]
if field_val.blank?
return fail_with("login.missing_user_field") if f.required?
else
fields["user_field_#{f.id}"] = field_val
end
field_params = params[:user_fields] || {}
fields = user.custom_fields
user_fields.each do |f|
field_val = field_params[f.id.to_s]
if field_val.blank?
return fail_with("login.missing_user_field") if f.required?
else
fields["user_field_#{f.id}"] = field_val
end
user.custom_fields = fields
end
user.custom_fields = fields
end
authentication = UserAuthenticator.new(user, session)