From 518779d96d817a0eab6c563444208ec659e27cec Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 7 Jan 2010 21:12:16 +0000
Subject: [PATCH] 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
---
 app/models/query.rb              | 2 +-
 app/views/reports/_details.rhtml | 5 +++++
 app/views/reports/_simple.rhtml  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index afbb68772..788f34e40 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -232,7 +232,7 @@ class Query < ActiveRecord::Base
   
   def add_short_filter(field, expression)
     return unless expression
-    parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
+    parms = expression.scan(/^(o|c|!\*|!|\*)?(.*)$/).first
     add_filter field, (parms[0] || "="), [parms[1] || ""]
   end
   
diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml
index c3ad2bed7..c9cd88bb8 100644
--- a/app/views/reports/_details.rhtml
+++ b/app/views/reports/_details.rhtml
@@ -17,27 +17,32 @@
 <tr class="<%= cycle("odd", "even") %>">
   <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id %></td>
   <% for status in @statuses %>
     <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)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "status_id" => status.id, 
                                                 "#{field_name}" => row.id %></td>
   <% end %>
   <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "o" %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "c" %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "*" %></td>  
 </tr>
diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml
index 7f799f325..e82f376a1 100644
--- a/app/views/reports/_simple.rhtml
+++ b/app/views/reports/_simple.rhtml
@@ -13,20 +13,24 @@
 <tr class="<%= cycle("odd", "even") %>">
   <td><%= link_to row.name, :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "o" %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "c" %></td>
   <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                 :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
                                                 :set_filter => 1, 
+                                                :subproject_id => '!*',
                                                 "#{field_name}" => row.id,
                                                 "status_id" => "*" %></td>  
 </tr>