From c605477da5e5d89ad2c196150265c061f990cbf6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 11 Nov 2011 11:31:49 +0000 Subject: [PATCH] Merged r6314 from trunk (#8633). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7765 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/query.rb | 2 +- test/unit/query_test.rb | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/models/query.rb b/app/models/query.rb index 1bd4ec0fb..1e18ae787 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -521,7 +521,7 @@ class Query < ActiveRecord::Base # Returns the issue count def issue_count - Issue.count(:include => [:status, :project], :conditions => statement) + Issue.visible.count(:include => [:status, :project], :conditions => statement) rescue ::ActiveRecord::StatementInvalid => e raise StatementInvalid.new(e.message) end diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 27a0a37e7..abaf0be9d 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -356,7 +356,21 @@ class QueryTest < ActiveSupport::TestCase q.issues(:conditions => "foo = 1") end end - + + def test_issue_count + q = Query.new(:name => '_') + issue_count = q.issue_count + assert_equal q.issues.size, issue_count + end + + def test_issue_count_with_archived_issues + p = Project.generate!( :status => Project::STATUS_ARCHIVED ) + i = Issue.generate!( :project => p, :tracker => p.trackers.first ) + assert !i.visible? + + test_issue_count + end + def test_issue_count_by_association_group q = Query.new(:name => '_', :group_by => 'assigned_to') count_by_group = q.issue_count_by_group -- 2.39.5