Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-03 21:30:13 +01:00
Code Issues Packages Projects Releases Activity

Merge r21965 from trunk to 4.2-stable (#37925).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21969 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2022-11-29 07:16:37 +00:00
parent ee74f9b588
commit 5d0dc65ebe
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/query.rb
View File

@@ -1056,7 +1056,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

14
test/unit/query_test.rb
View File

@@ -2713,4 +2713,18 @@ class QueryTest < ActiveSupport::TestCase
# Non-paginated issue ids and paginated issue ids should be in the same order.
assert_equal issue_ids, paginated_issue_ids
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