kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Toshi MARUYAMA 2011-08-21 01:53:41 +00:00
parent 8be05afff8
commit a8c0583e5e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/member_role.rb
View File

@ -1,16 +1,16 @@
# Redmine - project management software # 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 # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@ -18,30 +18,30 @@
class MemberRole < ActiveRecord::Base class MemberRole < ActiveRecord::Base
belongs_to :member belongs_to :member
belongs_to :role belongs_to :role
after_destroy :remove_member_if_empty after_destroy :remove_member_if_empty
after_create :add_role_to_group_users after_create :add_role_to_group_users
after_destroy :remove_role_from_group_users after_destroy :remove_role_from_group_users
validates_presence_of :role validates_presence_of :role
def validate def validate
errors.add :role_id, :invalid if role && !role.member? errors.add :role_id, :invalid if role && !role.member?
end end
def inherited? def inherited?
!inherited_from.nil? !inherited_from.nil?
end end
private private
def remove_member_if_empty def remove_member_if_empty
if member.roles.empty? if member.roles.empty?
member.destroy member.destroy
end end
end end
def add_role_to_group_users def add_role_to_group_users
if member.principal.is_a?(Group) if member.principal.is_a?(Group)
member.principal.users.each do |user| member.principal.users.each do |user|
@ -51,7 +51,7 @@ class MemberRole < ActiveRecord::Base
end end
end end
end end
def remove_role_from_group_users def remove_role_from_group_users
MemberRole.find(:all, :conditions => { :inherited_from => id }).group_by(&:member).each do |member, member_roles| MemberRole.find(:all, :conditions => { :inherited_from => id }).group_by(&:member).each do |member, member_roles|
member_roles.each(&:destroy) member_roles.each(&:destroy)