Mercurial > hg > soundsoftware-site
diff app/models/version.rb @ 1517:dffacf8a6908 redmine-2.5
Update to Redmine SVN revision 13367 on 2.5-stable branch
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:29:00 +0100 |
parents | e248c7af89ec |
children |
line wrap: on
line diff
--- a/app/models/version.rb Tue Sep 09 09:28:31 2014 +0100 +++ b/app/models/version.rb Tue Sep 09 09:29:00 2014 +0100 @@ -203,7 +203,7 @@ ["(CASE WHEN #{table}.effective_date IS NULL THEN 1 ELSE 0 END)", "#{table}.effective_date", "#{table}.name", "#{table}.id"] end - scope :sorted, order(fields_for_order_statement) + scope :sorted, lambda { order(fields_for_order_statement) } # Returns the sharings that +user+ can set the version to def allowed_sharings(user = User.current) @@ -232,7 +232,7 @@ unless @issue_count @open_issues_count = 0 @closed_issues_count = 0 - fixed_issues.count(:all, :group => :status).each do |status, count| + fixed_issues.group(:status).count.each do |status, count| if status.is_closed? @closed_issues_count += count else