tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source
This commit is contained in:
David Yip
2017-11-28 11:45:13 -06:00
parent 7463d80ff4 15fab79cfa
commit 95c270f5b1
56 changed files with 867 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/settings/migrations_controller.rb
View File

@ -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