github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 14:12:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: wasn't able to update user options anymore

Browse Source
This commit is contained in:
Régis Hanol
2017-09-26 20:00:10 +02:00
parent 460ed3c8cf
commit 28c54b42c5
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/users_controller.rb
View File

@ -849,7 +849,7 @@ class UsersController < ApplicationController
end end
def user_params def user_params
result = params.permit( permitted = [
:name, :name,
:email, :email,
:password, :password,
@ -858,11 +858,15 @@ class UsersController < ApplicationController
:muted_usernames, :muted_usernames,
:theme_key, :theme_key,
:locale :locale
).reverse_merge( ] + UserUpdater::OPTION_ATTR
ip_address: request.remote_ip,
registration_ip_address: request.remote_ip, result = params
locale: user_locale .permit(permitted)
) .reverse_merge(
ip_address: request.remote_ip,
registration_ip_address: request.remote_ip,
locale: user_locale
)
if !UsernameCheckerService.is_developer?(result['email']) && if !UsernameCheckerService.is_developer?(result['email']) &&
is_api? && is_api? &&

4
spec/controllers/users_controller_spec.rb
View File

@ -1440,13 +1440,15 @@ describe UsersController do
put :update, params: { put :update, params: {
username: user.username, username: user.username,
muted_usernames: "", muted_usernames: "",
theme_key: theme.key theme_key: theme.key,
email_direct: false
}, format: :json }, format: :json
user.reload user.reload
expect(user.muted_users.pluck(:username).sort).to be_empty expect(user.muted_users.pluck(:username).sort).to be_empty
expect(user.user_option.theme_key).to eq(theme.key) expect(user.user_option.theme_key).to eq(theme.key)
expect(user.user_option.email_direct).to eq(false)
end end