| @@ -40,15 +40,18 module IssuesHelper | |||
|
|
40 | 40 | end |
|
|
41 | 41 | issue_list(issues) do |issue, level| |
|
|
42 | 42 | group_name = group_count = nil |
|
|
43 | if query.grouped? && ((group = query.group_by_column.value(issue)) != previous_group || first) | |
|
|
44 | if group.blank? && group != false | |
|
|
45 | group_name = "(#{l(:label_blank_value)})" | |
|
|
46 | else | |
|
|
47 | group_name = column_content(query.group_by_column, issue) | |
|
|
43 | if query.grouped? | |
|
|
44 | group = query.group_by_column.value(issue) | |
|
|
45 | if first || group != previous_group | |
|
|
46 | if group.blank? && group != false | |
|
|
47 | group_name = "(#{l(:label_blank_value)})" | |
|
|
48 | else | |
|
|
49 | group_name = format_object(group) | |
|
|
50 | end | |
|
|
51 | group_name ||= "" | |
|
|
52 | group_count = issue_count_by_group[group] | |
|
|
53 | group_totals = totals_by_group.map {|column, t| total_tag(column, t[group] || 0)}.join(" ").html_safe | |
|
|
48 | 54 | end |
|
|
49 | group_name ||= "" | |
|
|
50 | group_count = issue_count_by_group[group] | |
|
|
51 | group_totals = totals_by_group.map {|column, t| total_tag(column, t[group] || 0)}.join(" ").html_safe | |
|
|
52 | 55 | end |
|
|
53 | 56 | yield issue, level, group_name, group_count, group_totals |
|
|
54 | 57 | previous_group, first = group, false |
General Comments 0
You need to be logged in to leave comments.
Login now