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 Style/MultilineTernaryOperator in app/models/mail_handler.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@18960 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2019-11-08 14:53:11 +00:00
parent 2870220c8d
commit 7bcb299a3c
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_todo.yml
View File

@ -1246,7 +1246,6 @@ Style/MultilineTernaryOperator:
- 'app/helpers/settings_helper.rb' - 'app/helpers/settings_helper.rb'
- 'app/models/issue_query.rb' - 'app/models/issue_query.rb'
- 'app/models/issue_relation.rb' - 'app/models/issue_relation.rb'
- 'app/models/mail_handler.rb'
- 'lib/redmine/ciphering.rb' - 'lib/redmine/ciphering.rb'
- 'lib/redmine/scm/adapters/filesystem_adapter.rb' - 'lib/redmine/scm/adapters/filesystem_adapter.rb'
- 'lib/redmine/scm/adapters/git_adapter.rb' - 'lib/redmine/scm/adapters/git_adapter.rb'

20
app/models/mail_handler.rb
View File

@ -344,10 +344,12 @@ class MailHandler < ActionMailer::Base
@keywords[attr] @keywords[attr]
else else
@keywords[attr] = begin @keywords[attr] = begin
override = options.key?(:override) ? override =
options[:override] : if options.key?(:override)
(handler_options[:allow_override] & [attr.to_s.downcase.gsub(/\s+/, '_'), 'all']).present? options[:override]
else
(handler_options[:allow_override] & [attr.to_s.downcase.gsub(/\s+/, '_'), 'all']).present?
end
if override && (v = extract_keyword!(cleaned_up_text_body, attr, options[:format])) if override && (v = extract_keyword!(cleaned_up_text_body, attr, options[:format]))
v v
elsif !handler_options[:issue][attr].blank? elsif !handler_options[:issue][attr].blank?
@ -503,11 +505,13 @@ class MailHandler < ActionMailer::Base
parts.reject! do |part| parts.reject! do |part|
part.attachment? part.attachment?
end end
parts.map do |p| parts.map do |p|
body_charset = Mail::RubyVer.respond_to?(:pick_encoding) ? body_charset =
Mail::RubyVer.pick_encoding(p.charset).to_s : p.charset if Mail::RubyVer.respond_to?(:pick_encoding)
Mail::RubyVer.pick_encoding(p.charset).to_s
else
p.charset
end
body = Redmine::CodesetUtil.to_utf8(p.body.decoded, body_charset) body = Redmine::CodesetUtil.to_utf8(p.body.decoded, body_charset)
# convert html parts to text # convert html parts to text
p.mime_type == 'text/html' ? self.class.html_body_to_text(body) : self.class.plain_text_body_to_text(body) p.mime_type == 'text/html' ? self.class.html_body_to_text(body) : self.class.plain_text_body_to_text(body)