diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-28 11:45:13 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-11-28 11:45:13 -0600 |
commit | 95c270f5b1ffd328345a7b1223f65876f3d88423 (patch) | |
tree | 621e27e89b238d8806fdd3294009361d0691f49c /app/controllers/settings | |
parent | 7463d80ff442833a4ad299460f37c27be9b8cda1 (diff) | |
parent | 15fab79cfa5b732e9d7816f162272d72cf06c733 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/controllers/settings')
-rw-r--r-- | app/controllers/settings/migrations_controller.rb | 15 |
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 |