diff options
| -rw-r--r-- | app/views/issues/_list.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/issues_controller_test.rb | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index fb190d42b..48b5860a7 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -22,7 +22,7 @@ <tr class="group open"> <td colspan="<%= query.inline_columns.size + 2 %>"> <span class="expander" onclick="toggleRowGroup(this);"> </span> - <%= group.blank? ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count"><%= @issue_count_by_group[group] %></span> + <%= (group.blank? && group != false) ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count"><%= @issue_count_by_group[group] %></span> <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %> </td> diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index ac1cb2ffa..d32c0ff49 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -294,6 +294,22 @@ class IssuesControllerTest < ActionController::TestCase end end + def test_index_grouped_by_boolean_custom_field_should_distinguish_blank_and_false_values + cf = IssueCustomField.create!(:name => 'Bool', :is_for_all => true, :tracker_ids => [1,2,3], :field_format => 'bool') + CustomValue.create!(:custom_field => cf, :customized => Issue.find(1), :value => '1') + CustomValue.create!(:custom_field => cf, :customized => Issue.find(2), :value => '0') + CustomValue.create!(:custom_field => cf, :customized => Issue.find(3), :value => '') + + with_settings :default_language => 'en' do + get :index, :project_id => 1, :set_filter => 1, :group_by => "cf_#{cf.id}" + assert_response :success + end + + assert_select 'tr.group', :text => /Yes/ + assert_select 'tr.group', :text => /No/ + assert_select 'tr.group', :text => /none/ + end + def test_index_with_query_grouped_by_tracker_in_normal_order 3.times {|i| Issue.generate!(:tracker_id => (i + 1))} |