diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb index 21276f707..c733a0634 100644 --- 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 6a2888eaa..e16095e2b 100644 --- a/app/views/reports/_details.rhtml +++ b/app/views/reports/_details.rhtml @@ -19,23 +19,23 @@ :set_filter => 1, "#{field_name}" => row.id %> <% for status in @statuses %> - <%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }), + <%= 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 %> <% end %> - <%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }), + <%= 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" %> - <%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }), + <%= 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" %> - <%= link_to (aggregate data, { field_name => row.id }), + <%= 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 20ff41fe2..8b5a7fe47 100644 --- a/app/views/reports/_simple.rhtml +++ b/app/views/reports/_simple.rhtml @@ -14,17 +14,17 @@ <%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), :set_filter => 1, "#{field_name}" => row.id %> - <%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }), + <%= 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" %> - <%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }), + <%= 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" %> - <%= link_to (aggregate data, { field_name => row.id }), + <%= 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,