kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code cleanup. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10887 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-11-27 22:13:14 +00:00
parent e43448f6ca
commit 9a270c46c0
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue_category.rb
View File

@ -27,7 +27,7 @@ class IssueCategory < ActiveRecord::Base
safe_attributes 'name', 'assigned_to_id' safe_attributes 'name', 'assigned_to_id'
scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}} scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
alias :destroy_without_reassign :destroy alias :destroy_without_reassign :destroy

2
app/models/issue_status.rb
View File

@ -29,7 +29,7 @@ class IssueStatus < ActiveRecord::Base
validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
scope :sorted, order("#{table_name}.position ASC") scope :sorted, order("#{table_name}.position ASC")
scope :named, lambda {|arg| where(["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip])} scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
def update_default def update_default
IssueStatus.update_all({:is_default => false}, ['id <> ?', id]) if self.is_default? IssueStatus.update_all({:is_default => false}, ['id <> ?', id]) if self.is_default?

11
app/models/version.rb
View File

@ -35,10 +35,11 @@ class Version < ActiveRecord::Base
validates_inclusion_of :sharing, :in => VERSION_SHARINGS validates_inclusion_of :sharing, :in => VERSION_SHARINGS
validate :validate_version validate :validate_version
scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}} scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
scope :open, :conditions => {:status => 'open'} scope :open, where(:status => 'open')
scope :visible, lambda {|*args| { :include => :project, scope :visible, lambda {|*args|
:conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } } includes(:project).where(Project.allowed_to_condition(args.first || User.current, :view_issues))
}
safe_attributes 'name', safe_attributes 'name',
'description', 'description',
@ -79,7 +80,7 @@ class Version < ActiveRecord::Base
# Returns the total reported time for this version # Returns the total reported time for this version
def spent_hours 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 end
def closed? def closed?