Only check for @set_filter@ param when retriving the default query (#7360, 35795...

git-svn-id: http://svn.redmine.org/redmine/trunk@21481 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f1dfa2b58ae02f116bd27f75f2db84a412c468b9..056d309e90bbc119751e2d075ab8db77de30c968 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -484,7 +484,7 @@ class IssuesController < ApplicationController
   def retrieve_default_query(use_session)
     return if params[:query_id].present?
     return if api_request?
-    return if params[:set_filter] && (params.key?(:op) || params.key?(:f))
+    return if params[:set_filter]
 
     if params[:without_default].present?
       params[:set_filter] = 1

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index e775f6b106967e17ec63ab0c1e164ab54c2c0d53..da7259da161a0a77d9c20a2bd077e9b7986ba245 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -328,7 +328,7 @@ class ProjectsController < ApplicationController
   def retrieve_default_query
     return if params[:query_id].present?
     return if api_request?
-    return if params[:set_filter] && (params.key?(:op) || params.key?(:f))
+    return if params[:set_filter]
 
     if params[:without_default].present?
       params[:set_filter] = 1