Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10994 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
d46a0a3a4f
commit
c93fccc84a
|
@ -35,7 +35,7 @@ class IssueCategory < ActiveRecord::Base
|
|||
# If a category is specified, issues are reassigned to this category
|
||||
def destroy(reassign_to = nil)
|
||||
if reassign_to && reassign_to.is_a?(IssueCategory) && reassign_to.project == self.project
|
||||
Issue.update_all("category_id = #{reassign_to.id}", "category_id = #{id}")
|
||||
Issue.update_all({:category_id => reassign_to.id}, {:category_id => id})
|
||||
end
|
||||
destroy_without_reassign
|
||||
end
|
||||
|
|
|
@ -67,7 +67,7 @@ class Message < ActiveRecord::Base
|
|||
|
||||
def update_messages_board
|
||||
if board_id_changed?
|
||||
Message.update_all("board_id = #{board_id}", ["id = ? OR parent_id = ?", root.id, root.id])
|
||||
Message.update_all({:board_id => board_id}, ["id = ? OR parent_id = ?", root.id, root.id])
|
||||
Board.reset_counters!(board_id_was)
|
||||
Board.reset_counters!(board_id)
|
||||
end
|
||||
|
|
|
@ -30,7 +30,7 @@ class Principal < ActiveRecord::Base
|
|||
has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
|
||||
|
||||
# Groups and active users
|
||||
scope :active, lambda { where("#{Principal.table_name}.status = 1") }
|
||||
scope :active, lambda { where(:status => STATUS_ACTIVE) }
|
||||
|
||||
scope :like, lambda {|q|
|
||||
q = q.to_s
|
||||
|
@ -57,7 +57,7 @@ class Principal < ActiveRecord::Base
|
|||
where("1=0")
|
||||
else
|
||||
ids = projects.map(&:id)
|
||||
where("#{Principal.table_name}.status = 1 AND #{Principal.table_name}.id IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids)
|
||||
active.where("#{Principal.table_name}.id IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids)
|
||||
end
|
||||
}
|
||||
# Principals that are not members of projects
|
||||
|
|
Loading…
Reference in New Issue