Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

When restoring a backup, disable emails. 

This prevents accidental sending of emails after a restore before
the admin has had a chance to review everything.
This commit is contained in:
Robin Ward 2016-06-24 17:14:47 -04:00
parent 3232ce8265
commit ccf9b70671
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/admin/backups_controller.rb
View File

@ -77,6 +77,7 @@ class Admin::BackupsController < Admin::AdminController
client_id: params.fetch(:client_id), client_id: params.fetch(:client_id),
publish_to_message_bus: true, publish_to_message_bus: true,
} }
SiteSetting.set_and_log(:disable_emails, true, current_user)
BackupRestore.restore!(current_user.id, opts) BackupRestore.restore!(current_user.id, opts)
rescue BackupRestore::OperationRunningError rescue BackupRestore::OperationRunningError
render json: failed_json.merge(message: I18n.t("backup.operation_already_running")) render json: failed_json.merge(message: I18n.t("backup.operation_already_running"))

2
spec/controllers/admin/backups_controller_spec.rb
View File

@ -151,10 +151,12 @@ describe Admin::BackupsController do
describe ".restore" do describe ".restore" do
it "starts a restore" do it "starts a restore" do
expect(SiteSetting.disable_emails).to eq(false)
BackupRestore.expects(:restore!).with(@admin.id, filename: backup_filename, publish_to_message_bus: true, client_id: "foo") BackupRestore.expects(:restore!).with(@admin.id, filename: backup_filename, publish_to_message_bus: true, client_id: "foo")
xhr :post, :restore, id: backup_filename, client_id: "foo" xhr :post, :restore, id: backup_filename, client_id: "foo"
expect(SiteSetting.disable_emails).to eq(true)
expect(response).to be_success expect(response).to be_success
end end