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

Merge pull request #2492 from techAPJ/system-user-notifications 

Send notifications for backup/restore from system user
This commit is contained in:
Régis Hanol 2014-07-02 11:57:55 +02:00
parent d23c7cdc65 d0753ec7a5
commit bcad8f6441
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/export/exporter.rb
View File

@ -268,9 +268,9 @@ module Export
log "Notifying '#{@user.username}' of the end of the backup..."
# NOTE: will only notify if @user != Discourse.site_contact_user
if @success
SystemMessage.create(@user, :export_succeeded)
SystemMessage.create_from_system_user(@user, :export_succeeded)
else
SystemMessage.create(@user, :export_failed, logs: @logs.join("\n"))
SystemMessage.create_from_system_user(@user, :export_failed, logs: @logs.join("\n"))
end
end

4
lib/import/importer.rb
View File

@ -284,9 +284,9 @@ module Import
log "Notifying '#{user.username}' of the end of the restore..."
# NOTE: will only notify if user != Discourse.site_contact_user
if @success
SystemMessage.create(user, :import_succeeded)
SystemMessage.create_from_system_user(user, :import_succeeded)
else
SystemMessage.create(user, :import_failed, logs: @logs.join("\n"))
SystemMessage.create_from_system_user(user, :import_failed, logs: @logs.join("\n"))
end
else
log "Could not send notification to '#{@user_info[:username]}' (#{@user_info[:email]}), because the user does not exists..."