zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix preferences save

This commit is contained in:
Eugen Rochko 2017-02-07 00:23:38 +01:00
parent ac035108aa
commit 714e41d472
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/settings/preferences_controller.rb
View File

@ -21,9 +21,9 @@ class Settings::PreferencesController < ApplicationController
must_be_following: user_params[:interactions][:must_be_following] == '1', must_be_following: user_params[:interactions][:must_be_following] == '1',
} }
current_user.settings['default_privacy'] = user_params[:settings][:default_privacy] current_user.settings['default_privacy'] = user_params[:setting_default_privacy]
if current_user.update(user_params.except(:notification_emails, :interactions, :settings)) if current_user.update(user_params.except(:notification_emails, :interactions, :setting_default_privacy))
redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg') redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
else else
render action: :show render action: :show
@ -33,6 +33,6 @@ class Settings::PreferencesController < ApplicationController
private private
def user_params def user_params
params.require(:user).permit(:locale, settings: [:default_privacy], notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention], interactions: [:must_be_follower, :must_be_following]) params.require(:user).permit(:locale, :setting_default_privacy, notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention], interactions: [:must_be_follower, :must_be_following])
end end
end end