diff options
Diffstat (limited to 'app/views/reports')
| -rw-r--r-- | app/views/reports/_details.rhtml | 10 | ||||
| -rw-r--r-- | app/views/reports/_simple.rhtml | 8 | ||||
| -rw-r--r-- | app/views/reports/issue_report.rhtml | 5 |
3 files changed, 14 insertions, 9 deletions
diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml index 323816a13..6a2888eaa 100644 --- a/app/views/reports/_details.rhtml +++ b/app/views/reports/_details.rhtml @@ -15,28 +15,28 @@ <tbody> <% for row in rows %> <tr class="<%= cycle("odd", "even") %>"> - <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, + <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> <% for status in @statuses %> <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }), - :controller => 'projects', :action => 'list_issues', :id => @project, + :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 }), - :controller => 'projects', :action => 'list_issues', :id => @project, + :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 }), - :controller => 'projects', :action => 'list_issues', :id => @project, + :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 }), - :controller => 'projects', :action => 'list_issues', :id => @project, + :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), :set_filter => 1, "#{field_name}" => row.id, "status_id" => "*" %></td> diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml index 0e580fe72..20ff41fe2 100644 --- a/app/views/reports/_simple.rhtml +++ b/app/views/reports/_simple.rhtml @@ -11,21 +11,21 @@ <tbody> <% for row in rows %> <tr class="<%= cycle("odd", "even") %>"> - <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, + <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 }), - :controller => 'projects', :action => 'list_issues', :id => @project, + :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 }), - :controller => 'projects', :action => 'list_issues', :id => @project, + :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 }), - :controller => 'projects', :action => 'list_issues', :id => @project, + :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), :set_filter => 1, "#{field_name}" => row.id, "status_id" => "*" %></td> diff --git a/app/views/reports/issue_report.rhtml b/app/views/reports/issue_report.rhtml index 8f832f87e..1ab9dbdbd 100644 --- a/app/views/reports/issue_report.rhtml +++ b/app/views/reports/issue_report.rhtml @@ -36,6 +36,11 @@ <h3><%=l(:field_priority)%> <%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %> <br /> +<% if @project.children.any? %> +<h3><%=l(:field_subproject)%> <%= link_to image_tag('zoom_in.png'), :detail => 'subproject' %></h3> +<%= render :partial => 'simple', :locals => { :data => @issues_by_subproject, :field_name => "project_id", :rows => @subprojects } %> +<br /> +<% end %> <h3><%=l(:field_category)%> <%= link_to image_tag('zoom_in.png'), :detail => 'category' %></h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %> <br /> |