Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10917 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -258,7 +258,7 @@ class CustomField < ActiveRecord::Base
|
||||
|
||||
# to move in project_custom_field
|
||||
def self.for_all
|
||||
find(:all, :conditions => ["is_for_all=?", true], :order => 'position')
|
||||
where(:is_for_all => true).order('position').all
|
||||
end
|
||||
|
||||
def type_name
|
||||
|
||||
+5
-2
@@ -62,8 +62,11 @@ class Group < Principal
|
||||
|
||||
def user_removed(user)
|
||||
members.each do |member|
|
||||
MemberRole.find(:all, :include => :member,
|
||||
:conditions => ["#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids]).each(&:destroy)
|
||||
MemberRole.
|
||||
includes(:member).
|
||||
where("#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids).
|
||||
all.
|
||||
each(&:destroy)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -281,7 +281,7 @@ class MailHandler < ActionMailer::Base
|
||||
if user.allowed_to?("add_#{obj.class.name.underscore}_watchers".to_sym, obj.project)
|
||||
addresses = [email.to, email.cc].flatten.compact.uniq.collect {|a| a.strip.downcase}
|
||||
unless addresses.empty?
|
||||
watchers = User.active.find(:all, :conditions => ['LOWER(mail) IN (?)', addresses])
|
||||
watchers = User.active.where('LOWER(mail) IN (?)', addresses).all
|
||||
watchers.each {|w| obj.add_watcher(w)}
|
||||
end
|
||||
end
|
||||
|
||||
@@ -252,7 +252,7 @@ class Mailer < ActionMailer::Base
|
||||
# Mailer.account_activation_request(user).deliver => sends an email to all active administrators
|
||||
def account_activation_request(user)
|
||||
# Send the email to all active administrators
|
||||
recipients = User.active.find(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
|
||||
recipients = User.active.where(:admin => true).all.collect { |u| u.mail }.compact
|
||||
@user = user
|
||||
@url = url_for(:controller => 'users', :action => 'index',
|
||||
:status => User::STATUS_REGISTERED,
|
||||
|
||||
@@ -54,7 +54,7 @@ class MemberRole < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def remove_role_from_group_users
|
||||
MemberRole.find(:all, :conditions => { :inherited_from => id }).group_by(&:member).each do |member, member_roles|
|
||||
MemberRole.where(:inherited_from => id).all.group_by(&:member).each do |member, member_roles|
|
||||
member_roles.each(&:destroy)
|
||||
if member && member.user
|
||||
Watcher.prune(:user => member.user, :project => member.project)
|
||||
|
||||
@@ -138,7 +138,7 @@ class Project < ActiveRecord::Base
|
||||
# returns latest created projects
|
||||
# non public projects will be returned only if user is a member of those
|
||||
def self.latest(user=nil, count=5)
|
||||
visible(user).find(:all, :limit => count, :order => "created_on DESC")
|
||||
visible(user).limit(count).order("created_on DESC").all
|
||||
end
|
||||
|
||||
# Returns true if the project is visible to +user+ or to the current user.
|
||||
@@ -338,7 +338,7 @@ class Project < ActiveRecord::Base
|
||||
# by the current user
|
||||
def allowed_parents
|
||||
return @allowed_parents if @allowed_parents
|
||||
@allowed_parents = Project.find(:all, :conditions => Project.allowed_to_condition(User.current, :add_subprojects))
|
||||
@allowed_parents = Project.where(Project.allowed_to_condition(User.current, :add_subprojects)).all
|
||||
@allowed_parents = @allowed_parents - self_and_descendants
|
||||
if User.current.allowed_to?(:add_project, nil, :global => true) || (!new_record? && parent.nil?)
|
||||
@allowed_parents << nil
|
||||
@@ -415,7 +415,7 @@ class Project < ActiveRecord::Base
|
||||
# Closes open and locked project versions that are completed
|
||||
def close_completed_versions
|
||||
Version.transaction do
|
||||
versions.find(:all, :conditions => {:status => %w(open locked)}).each do |version|
|
||||
versions.where(:status => %w(open locked)).all.each do |version|
|
||||
if version.completed?
|
||||
version.update_attribute(:status, 'closed')
|
||||
end
|
||||
@@ -452,7 +452,7 @@ class Project < ActiveRecord::Base
|
||||
|
||||
# Returns a hash of project users grouped by role
|
||||
def users_by_role
|
||||
members.find(:all, :include => [:user, :roles]).inject({}) do |h, m|
|
||||
members.includes(:user, :roles).all.inject({}) do |h, m|
|
||||
m.roles.each do |r|
|
||||
h[r] ||= []
|
||||
h[r] << m.user
|
||||
@@ -786,7 +786,7 @@ class Project < ActiveRecord::Base
|
||||
|
||||
# Get issues sorted by root_id, lft so that parent issues
|
||||
# get copied before their children
|
||||
project.issues.find(:all, :order => 'root_id, lft').each do |issue|
|
||||
project.issues.reorder('root_id, lft').all.each do |issue|
|
||||
new_issue = Issue.new
|
||||
new_issue.copy_from(issue, :subtasks => false, :link => false)
|
||||
new_issue.project = self
|
||||
@@ -929,13 +929,11 @@ class Project < ActiveRecord::Base
|
||||
def system_activities_and_project_overrides(include_inactive=false)
|
||||
if include_inactive
|
||||
return TimeEntryActivity.shared.
|
||||
find(:all,
|
||||
:conditions => ["id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)]) +
|
||||
where("id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)).all +
|
||||
self.time_entry_activities
|
||||
else
|
||||
return TimeEntryActivity.shared.active.
|
||||
find(:all,
|
||||
:conditions => ["id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)]) +
|
||||
where("id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)).all +
|
||||
self.time_entry_activities.active
|
||||
end
|
||||
end
|
||||
|
||||
+4
-9
@@ -218,7 +218,7 @@ class Query < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def trackers
|
||||
@trackers ||= project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
|
||||
@trackers ||= project.nil? ? Tracker.sorted.all : project.rolled_up_trackers
|
||||
end
|
||||
|
||||
# Returns a hash of localized labels for all filter operators
|
||||
@@ -231,7 +231,7 @@ class Query < ActiveRecord::Base
|
||||
@available_filters = {
|
||||
"status_id" => {
|
||||
:type => :list_status, :order => 0,
|
||||
:values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] }
|
||||
:values => IssueStatus.sorted.all.collect{|s| [s.name, s.id.to_s] }
|
||||
},
|
||||
"tracker_id" => {
|
||||
:type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] }
|
||||
@@ -344,12 +344,7 @@ class Query < ActiveRecord::Base
|
||||
}
|
||||
}
|
||||
end
|
||||
add_custom_fields_filters(
|
||||
IssueCustomField.find(:all,
|
||||
:conditions => {
|
||||
:is_filter => true,
|
||||
:is_for_all => true
|
||||
}))
|
||||
add_custom_fields_filters(IssueCustomField.where(:is_filter => true, :is_for_all => true).all)
|
||||
end
|
||||
add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version
|
||||
if User.current.allowed_to?(:set_issues_private, nil, :global => true) ||
|
||||
@@ -455,7 +450,7 @@ class Query < ActiveRecord::Base
|
||||
@available_columns = ::Query.available_columns.dup
|
||||
@available_columns += (project ?
|
||||
project.all_issue_custom_fields :
|
||||
IssueCustomField.find(:all)
|
||||
IssueCustomField.all
|
||||
).collect {|cf| QueryCustomFieldColumn.new(cf) }
|
||||
|
||||
if User.current.allowed_to?(:view_time_entries, project, :global => true)
|
||||
|
||||
@@ -337,7 +337,7 @@ class Repository < ActiveRecord::Base
|
||||
|
||||
# scan changeset comments to find related and fixed issues for all repositories
|
||||
def self.scan_changesets_for_issue_ids
|
||||
find(:all).each(&:scan_changesets_for_issue_ids)
|
||||
all.each(&:scan_changesets_for_issue_ids)
|
||||
end
|
||||
|
||||
def self.scm_name
|
||||
|
||||
@@ -92,11 +92,12 @@ class Repository::Mercurial < Repository
|
||||
# Sqlite3 and PostgreSQL pass.
|
||||
# Is this MySQL bug?
|
||||
def latest_changesets(path, rev, limit=10)
|
||||
changesets.find(:all,
|
||||
:include => :user,
|
||||
:conditions => latest_changesets_cond(path, rev, limit),
|
||||
:limit => limit,
|
||||
:order => "#{Changeset.table_name}.id DESC")
|
||||
changesets.
|
||||
includes(:user).
|
||||
where(latest_changesets_cond(path, rev, limit)).
|
||||
limit(limit).
|
||||
order("#{Changeset.table_name}.id DESC").
|
||||
all
|
||||
end
|
||||
|
||||
def latest_changesets_cond(path, rev, limit)
|
||||
|
||||
@@ -29,7 +29,7 @@ class Watcher < ActiveRecord::Base
|
||||
prune_single_user(options[:user], options)
|
||||
else
|
||||
pruned = 0
|
||||
User.find(:all, :conditions => "id IN (SELECT DISTINCT user_id FROM #{table_name})").each do |user|
|
||||
User.where("id IN (SELECT DISTINCT user_id FROM #{table_name})").all.each do |user|
|
||||
pruned += prune_single_user(user, options)
|
||||
end
|
||||
pruned
|
||||
@@ -47,7 +47,7 @@ class Watcher < ActiveRecord::Base
|
||||
def self.prune_single_user(user, options={})
|
||||
return unless user.is_a?(User)
|
||||
pruned = 0
|
||||
find(:all, :conditions => {:user_id => user.id}).each do |watcher|
|
||||
where(:user_id => user.id).all.each do |watcher|
|
||||
next if watcher.watchable.nil?
|
||||
|
||||
if options.has_key?(:project)
|
||||
|
||||
Reference in New Issue
Block a user