mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-19 15:01:14 +00:00
code cleanup: rubocop: fix Style/MultilineTernaryOperator in app/helpers/issues_helper.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@18496 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
fc243aa3ea
commit
a6116a98c5
@ -1361,7 +1361,6 @@ Style/MultilineIfModifier:
|
|||||||
Style/MultilineTernaryOperator:
|
Style/MultilineTernaryOperator:
|
||||||
Exclude:
|
Exclude:
|
||||||
- 'app/controllers/workflows_controller.rb'
|
- 'app/controllers/workflows_controller.rb'
|
||||||
- 'app/helpers/issues_helper.rb'
|
|
||||||
- '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'
|
||||||
|
|||||||
@ -95,13 +95,19 @@ module IssuesHelper
|
|||||||
issue_list(issue.descendants.visible.preload(:status, :priority, :tracker, :assigned_to).sort_by(&:lft)) do |child, level|
|
issue_list(issue.descendants.visible.preload(:status, :priority, :tracker, :assigned_to).sort_by(&:lft)) do |child, level|
|
||||||
css = +"issue issue-#{child.id} hascontextmenu #{child.css_classes}"
|
css = +"issue issue-#{child.id} hascontextmenu #{child.css_classes}"
|
||||||
css << " idnt idnt-#{level}" if level > 0
|
css << " idnt idnt-#{level}" if level > 0
|
||||||
buttons = manage_relations ? link_to(l(:label_delete_link_to_subtask),
|
buttons =
|
||||||
issue_path({:id => child.id, :issue => {:parent_issue_id => ''}, :back_url => issue_path(issue.id), :no_flash => '1'}),
|
if manage_relations
|
||||||
|
link_to(l(:label_delete_link_to_subtask),
|
||||||
|
issue_path({:id => child.id, :issue => {:parent_issue_id => ''},
|
||||||
|
:back_url => issue_path(issue.id), :no_flash => '1'}),
|
||||||
:method => :put,
|
:method => :put,
|
||||||
:data => {:confirm => l(:text_are_you_sure)},
|
:data => {:confirm => l(:text_are_you_sure)},
|
||||||
:title => l(:label_delete_link_to_subtask),
|
:title => l(:label_delete_link_to_subtask),
|
||||||
:class => 'icon-only icon-link-break'
|
:class => 'icon-only icon-link-break'
|
||||||
) : "".html_safe
|
)
|
||||||
|
else
|
||||||
|
"".html_safe
|
||||||
|
end
|
||||||
buttons << link_to_context_menu
|
buttons << link_to_context_menu
|
||||||
|
|
||||||
s << content_tag('tr',
|
s << content_tag('tr',
|
||||||
@ -125,14 +131,19 @@ module IssuesHelper
|
|||||||
relations.each do |relation|
|
relations.each do |relation|
|
||||||
other_issue = relation.other_issue(issue)
|
other_issue = relation.other_issue(issue)
|
||||||
css = "issue hascontextmenu #{other_issue.css_classes}"
|
css = "issue hascontextmenu #{other_issue.css_classes}"
|
||||||
buttons = manage_relations ? link_to(l(:label_relation_delete),
|
buttons =
|
||||||
|
if manage_relations
|
||||||
|
link_to(l(:label_relation_delete),
|
||||||
relation_path(relation),
|
relation_path(relation),
|
||||||
:remote => true,
|
:remote => true,
|
||||||
:method => :delete,
|
:method => :delete,
|
||||||
:data => {:confirm => l(:text_are_you_sure)},
|
:data => {:confirm => l(:text_are_you_sure)},
|
||||||
:title => l(:label_relation_delete),
|
:title => l(:label_relation_delete),
|
||||||
:class => 'icon-only icon-link-break'
|
:class => 'icon-only icon-link-break'
|
||||||
) :"".html_safe
|
)
|
||||||
|
else
|
||||||
|
"".html_safe
|
||||||
|
end
|
||||||
buttons << link_to_context_menu
|
buttons << link_to_context_menu
|
||||||
|
|
||||||
s << content_tag('tr',
|
s << content_tag('tr',
|
||||||
@ -450,12 +461,20 @@ module IssuesHelper
|
|||||||
when 'relation'
|
when 'relation'
|
||||||
if detail.value && !detail.old_value
|
if detail.value && !detail.old_value
|
||||||
rel_issue = Issue.visible.find_by_id(detail.value)
|
rel_issue = Issue.visible.find_by_id(detail.value)
|
||||||
value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
|
value =
|
||||||
(no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
|
if rel_issue.nil?
|
||||||
|
"#{l(:label_issue)} ##{detail.value}"
|
||||||
|
else
|
||||||
|
(no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
|
||||||
|
end
|
||||||
elsif detail.old_value && !detail.value
|
elsif detail.old_value && !detail.value
|
||||||
rel_issue = Issue.visible.find_by_id(detail.old_value)
|
rel_issue = Issue.visible.find_by_id(detail.old_value)
|
||||||
old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
|
old_value =
|
||||||
(no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
|
if rel_issue.nil?
|
||||||
|
"#{l(:label_issue)} ##{detail.old_value}"
|
||||||
|
else
|
||||||
|
(no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
relation_type = IssueRelation::TYPES[detail.prop_key]
|
relation_type = IssueRelation::TYPES[detail.prop_key]
|
||||||
label = l(relation_type[:name]) if relation_type
|
label = l(relation_type[:name]) if relation_type
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user