From 67169fe9dd19204a6243fca89b7380e361812cdf Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 21 Aug 2011 01:54:24 +0000 Subject: [PATCH] remove trailing white-spaces from app/models/member.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6503 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/member.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/member.rb b/app/models/member.rb index d840cfc3e..0e15935c2 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -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. @@ -26,17 +26,17 @@ class Member < ActiveRecord::Base validates_uniqueness_of :user_id, :scope => :project_id after_destroy :unwatch_from_permission_change - + def name self.user.name end - + alias :base_role_ids= :role_ids= def role_ids=(arg) ids = (arg || []).collect(&:to_i) - [0] # Keep inherited roles ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id) - + new_role_ids = ids - role_ids # Add new roles new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) } @@ -47,16 +47,16 @@ class Member < ActiveRecord::Base unwatch_from_permission_change end end - + def <=>(member) a, b = roles.sort.first, member.roles.sort.first a == b ? (principal <=> member.principal) : (a <=> b) end - + def deletable? member_roles.detect {|mr| mr.inherited_from}.nil? end - + def include?(user) if principal.is_a?(Group) !user.nil? && user.groups.include?(principal) @@ -64,7 +64,7 @@ class Member < ActiveRecord::Base self.user == user end end - + def before_destroy if user # remove category based auto assignments for this member @@ -78,15 +78,15 @@ class Member < ActiveRecord::Base @membership.attributes = new_attributes @membership end - + protected - + def validate errors.add_on_empty :role if member_roles.empty? && roles.empty? end - + private - + # Unwatch things that the user is no longer allowed to view inside project def unwatch_from_permission_change if user