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

FEATURE: add filters on email logs

Browse Source
This commit is contained in:
Régis Hanol
2014-02-15 00:50:08 +01:00
parent 21f757fd72
commit 3f3c9ca7cb
16 changed files with 145 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,8 @@ require_dependency 'email/renderer'
class Admin::EmailController < Admin::AdminController
def index
render_json_dump({
delivery_method: delivery_method,
settings: delivery_settings
})
data = { delivery_method: delivery_method, settings: delivery_settings }
render_json_dump(data)
end
def test
@ -15,14 +13,14 @@ class Admin::EmailController < Admin::AdminController
render nothing: true
end
def logs
@email_logs = EmailLog.sent.limit(50).includes(:user).order('created_at desc').to_a
render_serialized(@email_logs, EmailLogSerializer)
def sent
email_logs = filter_email_logs(EmailLog.sent, params)
render_serialized(email_logs, EmailLogSerializer)
end
def skipped
@email_logs = EmailLog.skipped.limit(50).includes(:user).order('created_at desc').to_a
render_serialized(@email_logs, EmailLogSerializer)
email_logs = filter_email_logs(EmailLog.skipped, params)
render_serialized(email_logs, EmailLogSerializer)
end
def preview_digest
@ -33,6 +31,16 @@ class Admin::EmailController < Admin::AdminController
private
def filter_email_logs(email_logs, params)
email_logs = email_logs.limit(50).includes(:user).order("email_logs.created_at desc").references(:user)
email_logs = email_logs.where("users.username LIKE ?", "%#{params[:user]}%") if params[:user].present?
email_logs = email_logs.where("email_logs.to_address LIKE ?", "%#{params[:address]}%") if params[:address].present?
email_logs = email_logs.where("email_logs.email_type LIKE ?", "%#{params[:type]}%") if params[:type].present?
email_logs = email_logs.where("email_logs.reply_key LIKE ?", "%#{params[:reply_key]}%") if params[:reply_key].present?
email_logs = email_logs.where("email_logs.skipped_reason LIKE ?", "%#{params[:reason]}%") if params[:reason].present?
email_logs.to_a
end
def delivery_settings
action_mailer_settings
.reject { |k, v| k == :password }