On the issue report page, 0 issue counts are now displayed as dashes.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@629 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index 21276f7..c733a06 100644 (file)
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -29,4 +29,8 @@ module ReportsHelper
     a
   end
   
+  def aggregate_link(data, criteria, *args)
+    a = aggregate data, criteria
+    a > 0 ? link_to(a, *args) : '-'
+  end  
 end

diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml
index 6a2888e..e16095e 100644 (file)
--- a/app/views/reports/_details.rhtml
+++ b/app/views/reports/_details.rhtml
@@ -19,23 +19,23 @@
                                                 :set_filter => 1, 
                                                 "#{field_name}" => row.id %></td>
   <% for status in @statuses %>
-    <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }), 
+    <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, 
                                                 :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
                                                 "status_id" => status.id, 
                                                 "#{field_name}" => row.id %></td>
   <% end %>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
+  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                 :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "o" %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
+  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                 :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "c" %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
+  <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                 :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
                                                 "#{field_name}" => row.id,

diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml
index 20ff41f..8b5a7fe 100644 (file)
--- a/app/views/reports/_simple.rhtml
+++ b/app/views/reports/_simple.rhtml
@@ -14,17 +14,17 @@
   <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
                                                 "#{field_name}" => row.id %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
+  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                 :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "o" %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
+  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                 :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "c" %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
+  <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                 :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
                                                 "#{field_name}" => row.id,