about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authornullkal <nullkal@nil.nu>2017-11-28 22:31:23 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-11-28 14:31:23 +0100
commit1b57d4dd3a64cdafd74a12ff67502795b06a4eb2 (patch)
tree5de356c053d958c634670f6b262558285c921988 /app/controllers
parentd937a59997f60e9aa7a022d84792fc50473bf3d5 (diff)
Fix account migration feature (#5837)
* Make removable account migration

* Fix error during update of account migration setting

* Add notice when update account migration setting
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/settings/migrations_controller.rb15
1 files changed, 8 insertions, 7 deletions
diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb
index 711ba338f..b18403a7f 100644
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@@ -12,13 +12,10 @@ class Settings::MigrationsController < ApplicationController
   def update
     @migration = Form::Migration.new(resource_params)
 
-    if @migration.valid?
-      if current_account.moved_to_account_id != @migration.account&.id
-        current_account.update!(moved_to_account: @migration.account)
-        ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
-      end
-
-      redirect_to settings_migration_path
+    if @migration.valid? && migration_account_changed?
+      current_account.update!(moved_to_account: @migration.account)
+      ActivityPub::UpdateDistributionWorker.perform_async(current_account.id)
+      redirect_to settings_migration_path, notice: I18n.t('migrations.updated_msg')
     else
       render :show
     end
@@ -29,4 +26,8 @@ class Settings::MigrationsController < ApplicationController
   def resource_params
     params.require(:migration).permit(:acct)
   end
+
+  def migration_account_changed?
+    current_account.moved_to_account_id != @migration.account&.id
+  end
 end