Issues by Category should show tasks without category (#8106).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10771 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
399223daba
commit
f909a8c006
3 files changed
+21
-8
No files matched your search
@@ -44,7 +44,8 @@ module VersionsHelper
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
# When grouping by an association, Rails throws this exception if there's no result (bug)
|
||||
end
|
||||
counts = h.keys.compact.sort.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
|
||||
# Sort with nil keys in last position
|
||||
counts = h.keys.sort {|a,b| a.nil? ? 1 : (b.nil? ? -1 : a <=> b)}.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
|
||||
max = counts.collect {|c| c[:total]}.max
|
||||
|
||||
render :partial => 'issue_counts', :locals => {:version => version, :criteria => criteria, :counts => counts, :max => max}
|
||||
|
||||
@@ -14,12 +14,11 @@
|
||||
<% counts.each do |count| %>
|
||||
<tr>
|
||||
<td width="130px" align="right" >
|
||||
<%= link_to h(count[:group]), {:controller => 'issues',
|
||||
:action => 'index',
|
||||
:project_id => version.project,
|
||||
:set_filter => 1,
|
||||
:status_id => '*',
|
||||
:fixed_version_id => version}.merge("#{criteria}_id".to_sym => count[:group]) %>
|
||||
<% if count[:group] -%>
|
||||
<%= link_to(h(count[:group]), project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => count[:group])) %>
|
||||
<% else -%>
|
||||
<%= link_to(l(:label_none), project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => "!*")) %>
|
||||
<% end %>
|
||||
</td>
|
||||
<td width="240px">
|
||||
<%= progress_bar((count[:closed].to_f / count[:total])*100,
|
||||
|
||||
Reference in new issue
Block a user