diff options
Diffstat (limited to 'app/models/version.rb')
| -rw-r--r-- | app/models/version.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/version.rb b/app/models/version.rb index 16db9f05c..212ce851d 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -35,10 +35,11 @@ class Version < ActiveRecord::Base validates_inclusion_of :sharing, :in => VERSION_SHARINGS validate :validate_version - scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}} - scope :open, :conditions => {:status => 'open'} - scope :visible, lambda {|*args| { :include => :project, - :conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } } + scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)} + scope :open, where(:status => 'open') + scope :visible, lambda {|*args| + includes(:project).where(Project.allowed_to_condition(args.first || User.current, :view_issues)) + } safe_attributes 'name', 'description', @@ -79,7 +80,7 @@ class Version < ActiveRecord::Base # Returns the total reported time for this version def spent_hours - @spent_hours ||= TimeEntry.sum(:hours, :joins => :issue, :conditions => ["#{Issue.table_name}.fixed_version_id = ?", id]).to_f + @spent_hours ||= TimeEntry.joins(:issue).where("#{Issue.table_name}.fixed_version_id = ?", id).sum(:hours).to_f end def closed? |