From 7f2e36824ee7ffd58bc05ed5ee155f9a373875bf Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 5 Nov 2019 14:08:14 +0000 Subject: [PATCH] cleanup: rubocop: fix Style/MultilineTernaryOperator in app/models/message.rb git-svn-id: http://svn.redmine.org/redmine/trunk@18902 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 1 - app/models/message.rb | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5cff1020d..0bfff2e39 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1264,7 +1264,6 @@ Style/MultilineTernaryOperator: - 'app/models/issue_query.rb' - 'app/models/issue_relation.rb' - 'app/models/mail_handler.rb' - - 'app/models/message.rb' - 'lib/redmine/ciphering.rb' - 'lib/redmine/scm/adapters/filesystem_adapter.rb' - 'lib/redmine/scm/adapters/git_adapter.rb' diff --git a/app/models/message.rb b/app/models/message.rb index 7dc6412b3..f003db7af 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -33,8 +33,15 @@ class Message < ActiveRecord::Base :description => :content, :group => :parent, :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'}, - :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} : - {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"})} + :url => Proc.new {|o| + {:controller => 'messages', :action => 'show', + :board_id => o.board_id}. + merge( + if o.parent_id.nil? + {:id => o.id} + else + {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"} + end)} acts_as_activity_provider :scope => preload({:board => :project}, :author), :author_key => :author_id