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

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
518779d9 · Jean-Philippe Lang · eecc6864 · 518779d9 · 518779d9 · 518779d9
Commit 518779d9 authored Jan 07, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

query.rb app/models/query.rb +1 -1

_details.rhtml app/views/reports/_details.rhtml +5 -0

_simple.rhtml app/views/reports/_simple.rhtml +4 -0

No files found.
--- 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
  

--- 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>

--- 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>