github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:21:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix success response handling of sending digest preview email

Browse Source
This commit is contained in:
Neil Lalonde
2016-11-24 15:05:33 -05:00
parent 6168b2c57a
commit f885e5b5e6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
View File

@ -12,6 +12,7 @@ export default Ember.Controller.extend({
const model = this.get('model'); const model = this.get('model');
this.set('loading', true); this.set('loading', true);
this.set('sentEmail', false);
EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => { EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => {
model.setProperties(email.getProperties('html_content', 'text_content')); model.setProperties(email.getProperties('html_content', 'text_content'));
this.set('loading', false); this.set('loading', false);

2
app/controllers/admin/email_controller.rb
View File

@ -60,7 +60,7 @@ class Admin::EmailController < Admin::AdminController
message.to = params[:email] message.to = params[:email]
begin begin
Email::Sender.new(message, :digest).send Email::Sender.new(message, :digest).send
render nothing: true render json: success_json
rescue => e rescue => e
render json: {errors: [e.message]}, status: 422 render json: {errors: [e.message]}, status: 422
end end