fixes #2418 (includes hiding deleted dmails and allowing filtering on user name)

2015-07-07 16:47:23 -07:00
parent 4a24fe5074
commit 67e46f6e5c
9 changed files with 121 additions and 8 deletions
--- a/app/controllers/dmails_controller.rb
+++ b/app/controllers/dmails_controller.rb
@@ -17,7 +17,7 @@ class DmailsController < ApplicationController
    if params[:folder] && params[:set_default_folder]
      cookies.permanent[:dmail_folder] = params[:folder]
    end
-    @query = Dmail.visible.search(params[:search])
+    @query = Dmail.active.visible.search(params[:search])
    @dmails = @query.order("dmails.created_at desc").paginate(params[:page], :limit => params[:limit])
    respond_with(@dmails) do |format|
      format.xml do