From 3758b91e5493a9c55de174f5ea1c6a0ac2a864ca Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 5 Nov 2020 13:42:00 +0000 Subject: [PATCH] add empty line after guard clause to app/models/role.rb git-svn-id: http://svn.redmine.org/redmine/trunk@20260 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/role.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/role.rb b/app/models/role.rb index c2159eeb1..7b097f47d 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -108,6 +108,7 @@ class Role < ActiveRecord::Base # Copies attributes from another role, arg can be an id or a Role def copy_from(arg, options={}) return unless arg.present? + role = arg.is_a?(Role) ? arg : Role.find_by_id(arg.to_s) self.attributes = role.attributes.dup.except("id", "name", "position", "builtin", "permissions") self.permissions = role.permissions.dup @@ -133,6 +134,7 @@ class Role < ActiveRecord::Base def remove_permission!(*perms) return unless permissions.is_a?(Array) + permissions_will_change! perms.each { |p| permissions.delete(p.to_sym) } save! -- 2.39.5