Browse Source

cleanup: rubocop: fix Style/MultilineTernaryOperator and Style/NestedTernaryOperator in app/models/issue_relation.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@18961 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Toshi MARUYAMA 4 years ago
parent
commit
c40714edd1
2 changed files with 5 additions and 5 deletions
  1. 0
    2
      .rubocop_todo.yml
  2. 5
    3
      app/models/issue_relation.rb

+ 0
- 2
.rubocop_todo.yml View File

@@ -1245,7 +1245,6 @@ Style/MultilineTernaryOperator:
- 'app/controllers/workflows_controller.rb'
- 'app/helpers/settings_helper.rb'
- 'app/models/issue_query.rb'
- 'app/models/issue_relation.rb'
- 'lib/redmine/ciphering.rb'
- 'lib/redmine/scm/adapters/filesystem_adapter.rb'
- 'lib/redmine/scm/adapters/git_adapter.rb'
@@ -1298,7 +1297,6 @@ Style/NestedParenthesizedCalls:
Style/NestedTernaryOperator:
Exclude:
- 'app/helpers/queries_helper.rb'
- 'app/models/issue_relation.rb'
- 'app/models/journal.rb'

# Cop supports --auto-correct.

+ 5
- 3
app/models/issue_relation.rb View File

@@ -152,9 +152,11 @@ class IssueRelation < ActiveRecord::Base
end

def label_for(issue)
TYPES[relation_type] ?
TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] :
:unknow
if TYPES[relation_type]
TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name]
else
:unknow
end
end

def to_s(issue=nil)

Loading…
Cancel
Save