From bafb74badd5509aad3174f0e6d3d39ef096c2476 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Tue, 29 Nov 2022 07:15:53 +0000 Subject: [PATCH] Merge r21965 from trunk to 5.0-stable (#37925). git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21968 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/query.rb | 2 +- test/unit/query_test.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/models/query.rb b/app/models/query.rb index 8f1a0cee3..0ece369f0 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -1064,7 +1064,7 @@ class Query < ActiveRecord::Base end def display_type=(type) - unless type || self.available_display_types.include?(type) + unless type && self.available_display_types.include?(type) type = self.available_display_types.first end options[:display_type] = type diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 4d6650ee8..20c7ebb75 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -2880,4 +2880,18 @@ class QueryTest < ActiveSupport::TestCase assert_equal 1, query.issue_count end + + def test_display_type_should_accept_known_types + query = ProjectQuery.new(:name => '_') + query.display_type = 'list' + + assert_equal 'list', query.display_type + end + + def test_display_type_should_not_accept_unknown_types + query = ProjectQuery.new(:name => '_') + query.display_type = 'invalid' + + assert_equal 'board', query.display_type + end end -- 2.39.5