Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-13 00:36:01 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20318 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-11-09 13:25:19 +00:00
parent 96acbee6d3
commit b2e81eecf2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/user.rb
View File

@@ -132,27 +132,27 @@ class User < Principal
after_save :update_notified_project_ids, :destroy_tokens, :deliver_security_notification after_save :update_notified_project_ids, :destroy_tokens, :deliver_security_notification
after_destroy :deliver_security_notification after_destroy :deliver_security_notification
scope :admin, lambda {|*args| scope :admin, (lambda do |*args|
admin = args.size > 0 ? !!args.first : true admin = args.size > 0 ? !!args.first : true
where(:admin => admin) where(:admin => admin)
} end)
scope :in_group, lambda {|group| scope :in_group, (lambda do |group|
group_id = group.is_a?(Group) ? group.id : group.to_i group_id = group.is_a?(Group) ? group.id : group.to_i
where("#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id) where("#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
} end)
scope :not_in_group, lambda {|group| scope :not_in_group, (lambda do |group|
group_id = group.is_a?(Group) ? group.id : group.to_i group_id = group.is_a?(Group) ? group.id : group.to_i
where("#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id) where("#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
} end)
scope :sorted, lambda {order(*User.fields_for_order_statement)} scope :sorted, lambda {order(*User.fields_for_order_statement)}
scope :having_mail, lambda {|arg| scope :having_mail, (lambda do |arg|
addresses = Array.wrap(arg).map {|a| a.to_s.downcase} addresses = Array.wrap(arg).map {|a| a.to_s.downcase}
if addresses.any? if addresses.any?
joins(:email_addresses).where("LOWER(#{EmailAddress.table_name}.address) IN (?)", addresses).distinct joins(:email_addresses).where("LOWER(#{EmailAddress.table_name}.address) IN (?)", addresses).distinct
else else
none none
end end
} end)
def set_mail_notification def set_mail_notification
self.mail_notification = Setting.default_notification_option if self.mail_notification.blank? self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?