diff options
| -rw-r--r-- | app/models/query.rb | 2 | ||||
| -rw-r--r-- | test/unit/query_test.rb | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index fc8a44a77..7e3369730 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -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 diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 39a6a6505..bb1f01dbc 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -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 |