github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-07 11:21:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Outgoing emails were not disabled after restoring backup

Browse Source
This commit is contained in:
Gerhard Schlager 2019-02-25 16:06:33 +01:00
parent 5952a6c0ad
commit dc961fecb9
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,6 @@ 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, 'yes', current_user)
BackupRestore.restore!(current_user.id, opts) BackupRestore.restore!(current_user.id, opts)
rescue BackupRestore::OperationRunningError rescue BackupRestore::OperationRunningError
render_error("backup.operation_already_running") render_error("backup.operation_already_running")

4
lib/backup_restore/restorer.rb
View File

@ -401,6 +401,10 @@ module BackupRestore
def reload_site_settings def reload_site_settings
log "Reloading site settings..." log "Reloading site settings..."
SiteSetting.refresh! SiteSetting.refresh!
log "Disabling outgoing emails for non-stuff users..."
user = User.find_by_email(@user_info[:email]) || Discourse.system_user
SiteSetting.set_and_log(:disable_emails, 'non-staff', user)
end end
def clear_emoji_cache def clear_emoji_cache

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

@ -162,12 +162,10 @@ RSpec.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("no")
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")
post "/admin/backups/#{backup_filename}/restore.json", params: { client_id: "foo" } post "/admin/backups/#{backup_filename}/restore.json", params: { client_id: "foo" }
expect(SiteSetting.disable_emails).to eq("yes")
expect(response.status).to eq(200) expect(response.status).to eq(200)
end end
end end