fixes #1842

2013-07-07 18:17:15 -04:00
parent 990f6751da
commit 1024d24298
2 changed files with 6 additions and 4 deletions
--- a/app/controllers/dmails_controller.rb
+++ b/app/controllers/dmails_controller.rb
@@ -14,7 +14,9 @@ class DmailsController < ApplicationController
  end

  def index
-    cookies.permanent[:dmail_folder] = params[:folder]
+    if params[:folder] && params[:set_default_folder]
+      cookies.permanent[:dmail_folder] = params[:folder]
+    end
    @search = Dmail.visible.search(params[:search])
    @dmails = @search.order("dmails.created_at desc").paginate(params[:page], :limit => params[:limit])
    respond_with(@dmails) do |format|