From: Toshi MARUYAMA Date: Tue, 17 Nov 2020 12:40:40 +0000 (+0000) Subject: shorten long line of app/models/member.rb X-Git-Tag: 4.2.0~414 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d76c7e21224933c7439d47f8467fe6e56279e7f5;p=redmine.git shorten long line of app/models/member.rb git-svn-id: http://svn.redmine.org/redmine/trunk@20404 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/member.rb b/app/models/member.rb index c04d139c9..1c41018de 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -30,8 +30,9 @@ class Member < ActiveRecord::Base before_destroy :set_issue_category_nil, :remove_from_project_default_assigned_to - scope :active, lambda { joins(:principal).where(:users => {:status => Principal::STATUS_ACTIVE})} - + scope :active, (lambda do + joins(:principal).where(:users => {:status => Principal::STATUS_ACTIVE}) + end) # Sort by first role and principal scope :sorted, (lambda do includes(:member_roles, :roles, :principal). @@ -67,7 +68,9 @@ class Member < ActiveRecord::Base new_role_ids = ids - role_ids # Add new roles - new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id, :member => self) } + new_role_ids.each do |id| + member_roles << MemberRole.new(:role_id => id, :member => self) + end # Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy) member_roles_to_destroy = member_roles.select {|mr| !ids.include?(mr.role_id)} if member_roles_to_destroy.any?