meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21968 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-11-29 07:15:53 +00:00
parent 06686a3edd
commit bafb74badd
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/query.rb
View File

@ -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

14
test/unit/query_test.rb
View File

@ -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