From: Marius Balteanu Date: Sun, 20 Mar 2022 21:49:57 +0000 (+0000) Subject: Only check for @set_filter@ param when retriving the default query (#7360, 35795... X-Git-Tag: 5.0.0~22 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1d32a44afa2dc649866ea71828ff7d8f67fae3c7;p=redmine.git Only check for @set_filter@ param when retriving the default query (#7360, 35795, #36389). 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 f1dfa2b58..056d309e9 100644 --- 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 e775f6b10..da7259da1 100644 --- 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