IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEAT: add cc addresses and post_id to sent email logs (#25014)

Browse Source 
* add cc addresses and post_id to sent email logs
* sort cc addresses by email address filter value and collapse additional addreses into tooltip
* add slice helper for use in ember tempaltes
This commit is contained in:
Kelv
2024-01-03 09:27:25 +08:00
committed by GitHub
parent 7b12be866d
commit b4a89ea610
8 changed files with 254 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ class Admin::EmailController < Admin::AdminController
AND post_reply_keys.user_id = email_logs.user_id
SQL
email_logs = filter_logs(email_logs, params)
email_logs = filter_logs(email_logs, params, include_ccs: params[:type] == "group_smtp")
if (reply_key = params[:reply_key]).present?
email_logs =
@@ -223,7 +223,7 @@ class Admin::EmailController < Admin::AdminController
private
def filter_logs(logs, params)
def filter_logs(logs, params, include_ccs: false)
table_name = logs.table_name
logs =
@@ -235,9 +235,14 @@ class Admin::EmailController < Admin::AdminController
.limit(50)
logs = logs.where("users.username ILIKE ?", "%#{params[:user]}%") if params[:user].present?
logs = logs.where("#{table_name}.to_address ILIKE ?", "%#{params[:address]}%") if params[
:address
].present?
if params[:address].present?
query = "#{table_name}.to_address ILIKE :address"
query += " OR #{table_name}.cc_addresses ILIKE :address" if include_ccs
logs = logs.where(query, { address: "%#{params[:address]}%" })
end
logs = logs.where("#{table_name}.email_type ILIKE ?", "%#{params[:type]}%") if params[
:type
].present?