From ea859aedca167730d2c64bb31e5f256875ff39e0 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 8 Nov 2019 06:26:33 +0000 Subject: [PATCH] cleanup: rubocop: fix Layout/AlignArguments in app/models/role.rb git-svn-id: http://svn.redmine.org/redmine/trunk@18947 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/role.rb | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/app/models/role.rb b/app/models/role.rb index dd1091ce7..5c4795c42 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -78,17 +78,21 @@ class Role < ActiveRecord::Base validates_presence_of :name validates_uniqueness_of :name validates_length_of :name, :maximum => 255 - validates_inclusion_of :issues_visibility, + validates_inclusion_of( + :issues_visibility, :in => ISSUES_VISIBILITY_OPTIONS.collect(&:first), - :if => lambda {|role| role.respond_to?(:issues_visibility) && role.issues_visibility_changed?} - validates_inclusion_of :users_visibility, + :if => lambda {|role| role.respond_to?(:issues_visibility) && role.issues_visibility_changed?}) + validates_inclusion_of( + :users_visibility, :in => USERS_VISIBILITY_OPTIONS.collect(&:first), - :if => lambda {|role| role.respond_to?(:users_visibility) && role.users_visibility_changed?} - validates_inclusion_of :time_entries_visibility, + :if => lambda {|role| role.respond_to?(:users_visibility) && role.users_visibility_changed?}) + validates_inclusion_of( + :time_entries_visibility, :in => TIME_ENTRIES_VISIBILITY_OPTIONS.collect(&:first), - :if => lambda {|role| role.respond_to?(:time_entries_visibility) && role.time_entries_visibility_changed?} + :if => lambda {|role| role.respond_to?(:time_entries_visibility) && role.time_entries_visibility_changed?}) - safe_attributes 'name', + safe_attributes( + 'name', 'assignable', 'position', 'issues_visibility', @@ -98,7 +102,7 @@ class Role < ActiveRecord::Base 'managed_role_ids', 'permissions', 'permissions_all_trackers', - 'permissions_tracker_ids' + 'permissions_tracker_ids') # Copies attributes from another role, arg can be an id or a Role def copy_from(arg, options={})