Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)

2017-12-14 21:35:30 +01:00
parent 573414f728
commit a3b2ea599d
2 changed files with 7 additions and 4 deletions
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@ -28,6 +28,7 @@ class Settings::MigrationsController < ApplicationController
  end

  def migration_account_changed?
-    current_account.moved_to_account_id != @migration.account&.id
+    current_account.moved_to_account_id != @migration.account&.id &&
+      current_account.id != @migration.account&.id
  end
 end