remove trailing white-spaces from app/models/member_role.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6502 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
8be05afff8
commit
a8c0583e5e
|
@ -1,16 +1,16 @@
|
|||
# Redmine - project management software
|
||||
# Copyright (C) 2006-2009 Jean-Philippe Lang
|
||||
# Copyright (C) 2006-2011 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
@ -18,30 +18,30 @@
|
|||
class MemberRole < ActiveRecord::Base
|
||||
belongs_to :member
|
||||
belongs_to :role
|
||||
|
||||
|
||||
after_destroy :remove_member_if_empty
|
||||
|
||||
after_create :add_role_to_group_users
|
||||
after_destroy :remove_role_from_group_users
|
||||
|
||||
|
||||
validates_presence_of :role
|
||||
|
||||
|
||||
def validate
|
||||
errors.add :role_id, :invalid if role && !role.member?
|
||||
end
|
||||
|
||||
|
||||
def inherited?
|
||||
!inherited_from.nil?
|
||||
end
|
||||
|
||||
|
||||
private
|
||||
|
||||
|
||||
def remove_member_if_empty
|
||||
if member.roles.empty?
|
||||
member.destroy
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def add_role_to_group_users
|
||||
if member.principal.is_a?(Group)
|
||||
member.principal.users.each do |user|
|
||||
|
@ -51,7 +51,7 @@ class MemberRole < ActiveRecord::Base
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def remove_role_from_group_users
|
||||
MemberRole.find(:all, :conditions => { :inherited_from => id }).group_by(&:member).each do |member, member_roles|
|
||||
member_roles.each(&:destroy)
|
||||
|
|
Loading…
Reference in New Issue