1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00

use "do end" instead of {} at ActiveRecord scope lambda of app/models/issue.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@20342 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-11-12 12:31:20 +00:00
parent 0ba5cd4fea
commit 4ce729d5af

View File

@ -72,39 +72,39 @@ class Issue < ActiveRecord::Base
validates :due_date, :date => true validates :due_date, :date => true
validate :validate_issue, :validate_required_fields, :validate_permissions validate :validate_issue, :validate_required_fields, :validate_permissions
scope :visible, lambda {|*args| scope :visible, (lambda do |*args|
joins(:project). joins(:project).
where(Issue.visible_condition(args.shift || User.current, *args)) where(Issue.visible_condition(args.shift || User.current, *args))
} end)
scope :open, lambda {|*args| scope :open, (lambda do |*args|
is_closed = !args.empty? ? !args.first : false is_closed = !args.empty? ? !args.first : false
joins(:status). joins(:status).
where(:issue_statuses => {:is_closed => is_closed}) where(:issue_statuses => {:is_closed => is_closed})
} end)
scope :recently_updated, lambda {order(:updated_on => :desc)} scope :recently_updated, lambda {order(:updated_on => :desc)}
scope :on_active_project, lambda { scope :on_active_project, (lambda do
joins(:project). joins(:project).
where(:projects => {:status => Project::STATUS_ACTIVE}) where(:projects => {:status => Project::STATUS_ACTIVE})
} end)
scope :fixed_version, lambda {|versions| scope :fixed_version, (lambda do |versions|
ids = [versions].flatten.compact.map {|v| v.is_a?(Version) ? v.id : v} ids = [versions].flatten.compact.map {|v| v.is_a?(Version) ? v.id : v}
ids.any? ? where(:fixed_version_id => ids) : none ids.any? ? where(:fixed_version_id => ids) : none
} end)
scope :assigned_to, lambda {|arg| scope :assigned_to, (lambda do |arg|
arg = Array(arg).uniq arg = Array(arg).uniq
ids = arg.map {|p| p.is_a?(Principal) ? p.id : p} ids = arg.map {|p| p.is_a?(Principal) ? p.id : p}
ids += arg.select {|p| p.is_a?(User)}.map(&:group_ids).flatten.uniq ids += arg.select {|p| p.is_a?(User)}.map(&:group_ids).flatten.uniq
ids.compact! ids.compact!
ids.any? ? where(:assigned_to_id => ids) : none ids.any? ? where(:assigned_to_id => ids) : none
} end)
scope :like, lambda {|q| scope :like, (lambda do |q|
q = q.to_s q = q.to_s
if q.present? if q.present?
where("LOWER(#{table_name}.subject) LIKE LOWER(?)", "%#{q}%") where("LOWER(#{table_name}.subject) LIKE LOWER(?)", "%#{q}%")
end end
} end)
before_validation :default_assign, on: :create before_validation :default_assign, on: :create
before_validation :clear_disabled_fields before_validation :clear_disabled_fields