| @@ -510,7 +510,7 class Query < ActiveRecord::Base | |||||
| 510 |
|
510 | |||
| 511 | # Returns the issue count |
|
511 | # Returns the issue count | |
| 512 | def issue_count |
|
512 | def issue_count | |
| 513 | Issue.count(:include => [:status, :project], :conditions => statement) |
|
513 | Issue.visible.count(:include => [:status, :project], :conditions => statement) | |
| 514 | rescue ::ActiveRecord::StatementInvalid => e |
|
514 | rescue ::ActiveRecord::StatementInvalid => e | |
| 515 | raise StatementInvalid.new(e.message) |
|
515 | raise StatementInvalid.new(e.message) | |
| 516 | end |
|
516 | end | |
| @@ -471,7 +471,21 class QueryTest < ActiveSupport::TestCase | |||||
| 471 | q.issues(:conditions => "foo = 1") |
|
471 | q.issues(:conditions => "foo = 1") | |
| 472 | end |
|
472 | end | |
| 473 | end |
|
473 | end | |
| 474 |
|
474 | |||
|
|
475 | def test_issue_count | |||
|
|
476 | q = Query.new(:name => '_') | |||
|
|
477 | issue_count = q.issue_count | |||
|
|
478 | assert_equal q.issues.size, issue_count | |||
|
|
479 | end | |||
|
|
480 | ||||
|
|
481 | def test_issue_count_with_archived_issues | |||
|
|
482 | p = Project.generate!( :status => Project::STATUS_ARCHIVED ) | |||
|
|
483 | i = Issue.generate!( :project => p, :tracker => p.trackers.first ) | |||
|
|
484 | assert !i.visible? | |||
|
|
485 | ||||
|
|
486 | test_issue_count | |||
|
|
487 | end | |||
|
|
488 | ||||
| 475 | def test_issue_count_by_association_group |
|
489 | def test_issue_count_by_association_group | |
| 476 | q = Query.new(:name => '_', :group_by => 'assigned_to') |
|
490 | q = Query.new(:name => '_', :group_by => 'assigned_to') | |
| 477 | count_by_group = q.issue_count_by_group |
|
491 | count_by_group = q.issue_count_by_group | |
General Comments 0
You need to be logged in to leave comments.
Login now