@@ -29,4 +29,8 module ReportsHelper | |||||
29 | a |
|
29 | a | |
30 | end |
|
30 | end | |
31 |
|
31 | |||
|
32 | def aggregate_link(data, criteria, *args) | |||
|
33 | a = aggregate data, criteria | |||
|
34 | a > 0 ? link_to(a, *args) : '-' | |||
|
35 | end | |||
32 | end |
|
36 | end |
@@ -19,23 +19,23 | |||||
19 | :set_filter => 1, |
|
19 | :set_filter => 1, | |
20 | "#{field_name}" => row.id %></td> |
|
20 | "#{field_name}" => row.id %></td> | |
21 | <% for status in @statuses %> |
|
21 | <% for status in @statuses %> | |
22 |
<td align="center"><%= |
|
22 | <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, | |
23 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), |
|
23 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), | |
24 | :set_filter => 1, |
|
24 | :set_filter => 1, | |
25 | "status_id" => status.id, |
|
25 | "status_id" => status.id, | |
26 | "#{field_name}" => row.id %></td> |
|
26 | "#{field_name}" => row.id %></td> | |
27 | <% end %> |
|
27 | <% end %> | |
28 |
<td align="center"><%= |
|
28 | <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, | |
29 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), |
|
29 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), | |
30 | :set_filter => 1, |
|
30 | :set_filter => 1, | |
31 | "#{field_name}" => row.id, |
|
31 | "#{field_name}" => row.id, | |
32 | "status_id" => "o" %></td> |
|
32 | "status_id" => "o" %></td> | |
33 |
<td align="center"><%= |
|
33 | <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, | |
34 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), |
|
34 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), | |
35 | :set_filter => 1, |
|
35 | :set_filter => 1, | |
36 | "#{field_name}" => row.id, |
|
36 | "#{field_name}" => row.id, | |
37 | "status_id" => "c" %></td> |
|
37 | "status_id" => "c" %></td> | |
38 |
<td align="center"><%= |
|
38 | <td align="center"><%= aggregate_link data, { field_name => row.id }, | |
39 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), |
|
39 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), | |
40 | :set_filter => 1, |
|
40 | :set_filter => 1, | |
41 | "#{field_name}" => row.id, |
|
41 | "#{field_name}" => row.id, |
@@ -14,17 +14,17 | |||||
14 | <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), |
|
14 | <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), | |
15 | :set_filter => 1, |
|
15 | :set_filter => 1, | |
16 | "#{field_name}" => row.id %></td> |
|
16 | "#{field_name}" => row.id %></td> | |
17 |
<td align="center"><%= |
|
17 | <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, | |
18 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), |
|
18 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), | |
19 | :set_filter => 1, |
|
19 | :set_filter => 1, | |
20 | "#{field_name}" => row.id, |
|
20 | "#{field_name}" => row.id, | |
21 | "status_id" => "o" %></td> |
|
21 | "status_id" => "o" %></td> | |
22 |
<td align="center"><%= |
|
22 | <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, | |
23 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), |
|
23 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), | |
24 | :set_filter => 1, |
|
24 | :set_filter => 1, | |
25 | "#{field_name}" => row.id, |
|
25 | "#{field_name}" => row.id, | |
26 | "status_id" => "c" %></td> |
|
26 | "status_id" => "c" %></td> | |
27 |
<td align="center"><%= |
|
27 | <td align="center"><%= aggregate_link data, { field_name => row.id }, | |
28 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), |
|
28 | :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)), | |
29 | :set_filter => 1, |
|
29 | :set_filter => 1, | |
30 | "#{field_name}" => row.id, |
|
30 | "#{field_name}" => row.id, |
General Comments 0
You need to be logged in to leave comments.
Login now