| @@ -521,7 +521,7 class Query < ActiveRecord::Base | |||||
| 521 |
|
521 | |||
| 522 | # Returns the issue count |
|
522 | # Returns the issue count | |
| 523 | def issue_count |
|
523 | def issue_count | |
| 524 | Issue.count(:include => [:status, :project], :conditions => statement) |
|
524 | Issue.visible.count(:include => [:status, :project], :conditions => statement) | |
| 525 | rescue ::ActiveRecord::StatementInvalid => e |
|
525 | rescue ::ActiveRecord::StatementInvalid => e | |
| 526 | raise StatementInvalid.new(e.message) |
|
526 | raise StatementInvalid.new(e.message) | |
| 527 | end |
|
527 | end | |
| @@ -356,7 +356,21 class QueryTest < ActiveSupport::TestCase | |||||
| 356 | q.issues(:conditions => "foo = 1") |
|
356 | q.issues(:conditions => "foo = 1") | |
| 357 | end |
|
357 | end | |
| 358 | end |
|
358 | end | |
| 359 |
|
359 | |||
|
|
360 | def test_issue_count | |||
|
|
361 | q = Query.new(:name => '_') | |||
|
|
362 | issue_count = q.issue_count | |||
|
|
363 | assert_equal q.issues.size, issue_count | |||
|
|
364 | end | |||
|
|
365 | ||||
|
|
366 | def test_issue_count_with_archived_issues | |||
|
|
367 | p = Project.generate!( :status => Project::STATUS_ARCHIVED ) | |||
|
|
368 | i = Issue.generate!( :project => p, :tracker => p.trackers.first ) | |||
|
|
369 | assert !i.visible? | |||
|
|
370 | ||||
|
|
371 | test_issue_count | |||
|
|
372 | end | |||
|
|
373 | ||||
| 360 | def test_issue_count_by_association_group |
|
374 | def test_issue_count_by_association_group | |
| 361 | q = Query.new(:name => '_', :group_by => 'assigned_to') |
|
375 | q = Query.new(:name => '_', :group_by => 'assigned_to') | |
| 362 | count_by_group = q.issue_count_by_group |
|
376 | count_by_group = q.issue_count_by_group | |
General Comments 0
You need to be logged in to leave comments.
Login now