meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

cleanup: rubocop: fix Layout/BlockAlignment in app/models/principal.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19003 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2019-11-09 09:18:51 +00:00
parent 73be0198d1
commit bc0d654802
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_todo.yml
View File

@ -19,7 +19,6 @@ Layout/AlignHash:
# SupportedStylesAlignWith: either, start_of_block, start_of_line # SupportedStylesAlignWith: either, start_of_block, start_of_line
Layout/BlockAlignment: Layout/BlockAlignment:
Exclude: Exclude:
- 'app/models/principal.rb'
- 'app/models/project.rb' - 'app/models/project.rb'
- 'app/models/time_entry.rb' - 'app/models/time_entry.rb'

11
app/models/principal.rb
View File

@ -179,11 +179,12 @@ class Principal < ActiveRecord::Base
if principal.nil? && / /.match?(keyword) if principal.nil? && / /.match?(keyword)
firstname, lastname = *(keyword.split) # "First Last Throwaway" firstname, lastname = *(keyword.split) # "First Last Throwaway"
principal ||= principals.detect {|a| principal ||=
a.is_a?(User) && principals.detect {|a|
firstname.casecmp(a.firstname.to_s) == 0 && a.is_a?(User) &&
lastname.casecmp(a.lastname.to_s) == 0 firstname.casecmp(a.firstname.to_s) == 0 &&
} lastname.casecmp(a.lastname.to_s) == 0
}
end end
if principal.nil? if principal.nil?
principal ||= principals.detect {|a| keyword.casecmp(a.name) == 0} principal ||= principals.detect {|a| keyword.casecmp(a.name) == 0}