diff options
author | nicolas <nclm@users.noreply.github.com> | 2016-11-25 13:33:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-25 13:33:00 +0100 |
commit | 959e4b81987080353415556cc3bbd2aab478adb4 (patch) | |
tree | 5db6ed034f98ac8f2ef34b48d2032b74617d21d1 /app/controllers/settings/preferences_controller.rb | |
parent | effdb42f4c63b957cfdef37a44dfa45284ece337 (diff) | |
parent | 8a3745a4df89f5a5f980370dabfab8f95c92a5f8 (diff) |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
-rw-r--r-- | app/controllers/settings/preferences_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 5be8719ae..cacc03b65 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -14,7 +14,10 @@ class Settings::PreferencesController < ApplicationController current_user.settings(:notification_emails).favourite = user_params[:notification_emails][:favourite] == '1' current_user.settings(:notification_emails).mention = user_params[:notification_emails][:mention] == '1' - if current_user.update(user_params.except(:notification_emails)) + current_user.settings(:interactions).must_be_follower = user_params[:interactions][:must_be_follower] == '1' + current_user.settings(:interactions).must_be_following = user_params[:interactions][:must_be_following] == '1' + + if current_user.update(user_params.except(:notification_emails, :interactions)) redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg') else render action: :show @@ -24,6 +27,6 @@ class Settings::PreferencesController < ApplicationController private def user_params - params.require(:user).permit(:locale, notification_emails: [:follow, :reblog, :favourite, :mention]) + params.require(:user).permit(:locale, notification_emails: [:follow, :reblog, :favourite, :mention], interactions: [:must_be_follower, :must_be_following]) end end |