Skip to content

O
OHR Support
Commit b3f3634d authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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
parent 29c623fa
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
app/helpers/reports_helper.rb
View file @ b3f3634d
...@@ -29,4 +29,8 @@ module ReportsHelper ...@@ -29,4 +29,8 @@ module ReportsHelper
a a
end end
def aggregate_link(data, criteria, *args)
a = aggregate data, criteria
a > 0 ? link_to(a, *args) : '-'
end
end end
app/views/reports/_details.rhtml
View file @ b3f3634d
...@@ -19,23 +19,23 @@ ...@@ -19,23 +19,23 @@
:set_filter => 1, :set_filter => 1,
"#{field_name}" => row.id %></td> "#{field_name}" => row.id %></td>
<% for status in @statuses %> <% 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)), :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
"status_id" => status.id, "status_id" => status.id,
"#{field_name}" => row.id %></td> "#{field_name}" => row.id %></td>
<% end %> <% 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)), :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "o" %></td> "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)), :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "c" %></td> "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)), :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
"#{field_name}" => row.id, "#{field_name}" => row.id,
......
app/views/reports/_simple.rhtml
View file @ b3f3634d
...@@ -14,17 +14,17 @@ ...@@ -14,17 +14,17 @@
<td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
"#{field_name}" => row.id %></td> "#{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)), :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "o" %></td> "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)), :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "c" %></td> "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)), :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
"#{field_name}" => row.id, "#{field_name}" => row.id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment