diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-10-03 07:16:47 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-10-03 07:16:47 +0000 |
| commit | 3952c4d2642e275c1b1b04135596265b04548a13 (patch) | |
| tree | bcac05dffca72e5db784d91eb55fed9b3edf65be /app/views/reports | |
| parent | 82abfa8ac576c9f8c85d9617d66b7d203b6b6b44 (diff) | |
| download | redmine-3952c4d2642e275c1b1b04135596265b04548a13.tar.gz redmine-3952c4d2642e275c1b1b04135596265b04548a13.zip | |
Extend Issue Summary to include subprojects (#2529).
Patch by Mizuki ISHIKAWA.
git-svn-id: http://svn.redmine.org/redmine/trunk@17563 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/reports')
| -rw-r--r-- | app/views/reports/_details.html.erb | 10 | ||||
| -rw-r--r-- | app/views/reports/_simple.html.erb | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/views/reports/_details.html.erb b/app/views/reports/_details.html.erb index 998089caf..d9d9a3614 100644 --- a/app/views/reports/_details.html.erb +++ b/app/views/reports/_details.html.erb @@ -14,13 +14,13 @@ <tbody> <% for row in rows %> <tr> - <td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row) %></td> + <td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row, :subproject_id => nil) %></td> <% for status in @statuses %> - <td><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %></td> + <td><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id, :subproject_id => nil) %></td> <% end %> - <td><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td> - <td><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td> - <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td> + <td><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o", :subproject_id => nil) %></td> + <td><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c", :subproject_id => nil) %></td> + <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*", :subproject_id => nil) %></td> </tr> <% end %> </tbody> diff --git a/app/views/reports/_simple.html.erb b/app/views/reports/_simple.html.erb index d6f51ad19..754b1f21d 100644 --- a/app/views/reports/_simple.html.erb +++ b/app/views/reports/_simple.html.erb @@ -11,10 +11,10 @@ <tbody> <% for row in rows %> <tr> - <td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row) %></td> - <td><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td> - <td><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td> - <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td> + <td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row, :subproject_id => nil) %></td> + <td><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o", :subproject_id => nil) %></td> + <td><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c", :subproject_id => nil) %></td> + <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*", :subproject_id => nil) %></td> </tr> <% end %> </tbody> |