about summary refs log tree commit diff
path: root/app/controllers/settings/preferences_controller.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-06-07 03:39:24 +0200
committerGitHub <noreply@github.com>2019-06-07 03:39:24 +0200
commit1db4117030ac69b1083ddfe7390dedb02cede421 (patch)
treea5d97d8f2046ab8455f108770570c3b3a5ba8bac /app/controllers/settings/preferences_controller.rb
parenta60364ca7d26c82c9353980d0966d37e9aa66014 (diff)
Change preferences page into appearance, notifications, and other (#10977)
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
-rw-r--r--app/controllers/settings/preferences_controller.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 930ff70e7..110debd6e 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -12,7 +12,7 @@ class Settings::PreferencesController < Settings::BaseController
 
     if current_user.update(user_params)
       I18n.locale = current_user.locale
-      redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
+      redirect_to after_update_redirect_path, notice: I18n.t('generic.changes_saved_msg')
     else
       render :show
     end
@@ -20,6 +20,10 @@ class Settings::PreferencesController < Settings::BaseController
 
   private
 
+  def after_update_redirect_path
+    settings_preferences_path
+  end
+
   def user_settings
     UserSettingsDecorator.new(current_user)
   end
@@ -51,7 +55,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_show_application,
       :setting_advanced_layout,
       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
-      interactions: %i(must_be_follower must_be_following)
+      interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )
   end
 end