Project

General

Profile

Feature #11069 » patch_for_locked_users_query.diff

Ksenia Altbregen, 2013-09-09 14:59

View differences:

app/models/principal.rb (working copy)
active.uniq.joins(:members).where("#{Member.table_name}.project_id IN (?)", ids)
end
}
# Principals that are locked members of a collection of projects
scope :locked_member_of, lambda {|projects|
projects = [projects] unless project.is_a?(Array)
if projects.empty?
where("1=0")
else
ids = projects.map(&:id)
locked.uniq.joins(:members).where("#{Member.table_name}.project_id IN (?)", ids)
end
}
# Principals that are not members of projects
scope :not_member_of, lambda {|projects|
projects = [projects] unless projects.is_a?(Array)
app/models/issue_query.rb (working copy)
issue_custom_fields = []
if project
principals += project.principals.sort
principals += project.principals
principals += project.locked_principals
principals.sort
unless project.leaf?
subprojects = project.descendants.visible.all
principals += Principal.member_of(subprojects)
principals += Principal.locked_member_of(subprojects)
end
versions = project.shared_versions.all
categories = project.issue_categories.all
......
else
if all_projects.any?
principals += Principal.member_of(all_projects)
principals += Principal.locked_member_of(all_projects)
end
versions = Version.visible.find_all_by_sharing('system')
issue_custom_fields = IssueCustomField.where(:is_filter => true, :is_for_all => true).all
app/models/project.rb (working copy)
has_many :member_principals, :class_name => 'Member',
:include => :principal,
:conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
has_many :locked_member_principals, :class_name => 'Member',
:include => :principal,
:conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_LOCKED})"
has_many :users, :through => :members
has_many :principals, :through => :member_principals, :source => :principal
has_many :locked_principals, :through => :locked_member_principals, :source => :principal
has_many :enabled_modules, :dependent => :delete_all
has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
(1-1/2)