jro_apps/redmine Commit - r8165:2a0257e8af82

Use open scope in version issues count methods....

Jean-Philippe Lang -

r8165:2a0257e8af82

parent child

Context file:

r8165:2a0257e8af82

app/models/issue.rb +4 -1

               named_scope :visible, lambda {|*args| { :include => :project,
                                                       :conditions => Issue.visible_condition(args.shift || User.current, *args) } }
-              named_scope :open, :conditions => ["#{IssueStatus.table_name}.is_closed = ?", false], :include => :status
+              named_scope :open, lambda {|*args|
+                is_closed = args.size > 0 ? !args.first : false
+                {:conditions => ["#{IssueStatus.table_name}.is_closed = ?", is_closed], :include => :status}
+              }
               named_scope :recently_updated, :order => "#{Issue.table_name}.updated_on DESC"
               named_scope :with_limit, lambda { |limit| { :limit => limit} }

app/models/version.rb +2 -2

               # Returns the total amount of open issues for this version.
               def open_issues_count
-                @open_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, false], :include => :status)
+                @open_issues_count ||= Issue.open.count(:all, :conditions => ["fixed_version_id = ?", self.id])
               end
               # Returns the total amount of closed issues for this version.
               def closed_issues_count
-                @closed_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, true], :include => :status)
+                @closed_issues_count ||= Issue.open(false).count(:all, :conditions => ["fixed_version_id = ?", self.id])
               end
               def wiki_page

test/unit/issue_test.rb +10 0

@@ -219,6 +219,16 class IssueTest < ActiveSupport::TestCase
219	assert_equal 0, Issue.find(1).descendants.visible.all.size	219	assert_equal 0, Issue.find(1).descendants.visible.all.size
220	end	220	end
221		221
		222	def test_open_scope
		223	issues = Issue.open.all
		224	assert_nil issues.detect(&:closed?)
		225	end
		226
		227	def test_open_scope_with_arg
		228	issues = Issue.open(false).all
		229	assert_equal issues, issues.select(&:closed?)
		230	end
		231
222	def test_errors_full_messages_should_include_custom_fields_errors	232	def test_errors_full_messages_should_include_custom_fields_errors
223	field = IssueCustomField.find_by_name('Database')	233	field = IssueCustomField.find_by_name('Database')
224		234

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages