Skip to content

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

Fixed: issue summary counts should link to the issue list without subprojects (#4525). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3283 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent eecc6864
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 1 deletion
app/models/query.rb
View file @ 518779d9
...@@ -232,7 +232,7 @@ class Query < ActiveRecord::Base ...@@ -232,7 +232,7 @@ class Query < ActiveRecord::Base
def add_short_filter(field, expression) def add_short_filter(field, expression)
return unless expression return unless expression
parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first parms = expression.scan(/^(o|c|!\*|!|\*)?(.*)$/).first
add_filter field, (parms[0] || "="), [parms[1] || ""] add_filter field, (parms[0] || "="), [parms[1] || ""]
end end
......
app/views/reports/_details.rhtml
View file @ 518779d9
...@@ -17,27 +17,32 @@ ...@@ -17,27 +17,32 @@
<tr class="<%= cycle("odd", "even") %>"> <tr class="<%= cycle("odd", "even") %>">
<td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id %></td> "#{field_name}" => row.id %></td>
<% for status in @statuses %> <% for status in @statuses %>
<td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"status_id" => status.id, "status_id" => status.id,
"#{field_name}" => row.id %></td> "#{field_name}" => row.id %></td>
<% end %> <% end %>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "o" %></td> "status_id" => "o" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "c" %></td> "status_id" => "c" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id }, <td align="center"><%= aggregate_link data, { field_name => row.id },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "*" %></td> "status_id" => "*" %></td>
</tr> </tr>
......
app/views/reports/_simple.rhtml
View file @ 518779d9
...@@ -13,20 +13,24 @@ ...@@ -13,20 +13,24 @@
<tr class="<%= cycle("odd", "even") %>"> <tr class="<%= cycle("odd", "even") %>">
<td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id %></td> "#{field_name}" => row.id %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "o" %></td> "status_id" => "o" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "c" %></td> "status_id" => "c" %></td>
<td align="center"><%= aggregate_link data, { field_name => row.id }, <td align="center"><%= aggregate_link data, { field_name => row.id },
:controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)),
:set_filter => 1, :set_filter => 1,
:subproject_id => '!*',
"#{field_name}" => row.id, "#{field_name}" => row.id,
"status_id" => "*" %></td> "status_id" => "*" %></td>
</tr> </tr>
......
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