diff options
| -rw-r--r-- | app/views/issues/_list.html.erb | 6 | ||||
| -rw-r--r-- | test/functional/issues_controller_test.rb | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 48b5860a7..024866782 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -14,10 +14,10 @@ <% end %> </tr> </thead> - <% previous_group = false %> + <% previous_group, first = false, true %> <tbody> <% issue_list(issues) do |issue, level| -%> - <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %> + <% if @query.grouped? && ((group = @query.group_by_column.value(issue)) != previous_group || first) %> <% reset_cycle %> <tr class="group open"> <td colspan="<%= query.inline_columns.size + 2 %>"> @@ -27,7 +27,7 @@ "toggleAllRowGroups(this)", :class => 'toggle-all') %> </td> </tr> - <% previous_group = group %> + <% previous_group, first = group, false %> <% end %> <tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>"> <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td> diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index d32c0ff49..7b7e7cbd4 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -305,11 +305,27 @@ class IssuesControllerTest < ActionController::TestCase assert_response :success end + assert_select 'tr.group', 3 assert_select 'tr.group', :text => /Yes/ assert_select 'tr.group', :text => /No/ assert_select 'tr.group', :text => /none/ end + def test_index_grouped_by_boolean_custom_field_with_false_group_in_first_position_should_show_the_group + cf = IssueCustomField.create!(:name => 'Bool', :is_for_all => true, :tracker_ids => [1,2,3], :field_format => 'bool', :is_filter => true) + CustomValue.create!(:custom_field => cf, :customized => Issue.find(1), :value => '0') + CustomValue.create!(:custom_field => cf, :customized => Issue.find(2), :value => '0') + + with_settings :default_language => 'en' do + get :index, :project_id => 1, :set_filter => 1, "cf_#{cf.id}" => "*", :group_by => "cf_#{cf.id}" + assert_response :success + assert_equal [1, 2], assigns(:issues).map(&:id).sort + end + + assert_select 'tr.group', 1 + assert_select 'tr.group', :text => /No/ + end + def test_index_with_query_grouped_by_tracker_in_normal_order 3.times {|i| Issue.generate!(:tracker_id => (i + 1))} |