meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-04 22:59:47 +00:00
Code Issues Releases Wiki Activity

Fixed that group is not displayed when the first group is a boolean custom field group with "No" value (#18896).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13922 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-01-19 21:36:59 +00:00
parent 0cde1fccbc
commit 4730ef894f
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/issues/_list.html.erb
View File

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

16
test/functional/issues_controller_test.rb
View File

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