From fb04274fc0102c046b533bc5d0cab523a9cbd2b5 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 30 Sep 2019 08:59:43 +0000 Subject: [PATCH] code cleanup: rubocop: fix Layout/EmptyLinesAroundBlockBody in app/helpers/application_helper.rb git-svn-id: http://svn.redmine.org/redmine/trunk@18557 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 1 - app/helpers/application_helper.rb | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index b5addccd6..d8e0e1fc6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -180,7 +180,6 @@ Layout/EmptyLinesAroundArguments: # SupportedStyles: empty_lines, no_empty_lines Layout/EmptyLinesAroundBlockBody: Exclude: - - 'app/helpers/application_helper.rb' - 'app/models/attachment.rb' - 'app/models/setting.rb' - 'db/schema.rb' diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ce4672876..b03326db4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -476,26 +476,21 @@ module ApplicationHelper bookmarked = jump_box.bookmarked_projects(params[:q]) recents = jump_box.recently_used_projects(params[:q]) projects = projects - (recents + bookmarked) - projects_label = (bookmarked.any? || recents.any?) ? :label_optgroup_others : :label_project_plural - jump = params[:jump].presence || current_menu_item s = (+'').html_safe - build_project_link = ->(project, level = 0){ padding = level * 16 text = content_tag('span', project.name, :style => "padding-left:#{padding}px;") - s << link_to(text, project_path(project, :jump => jump), :title => project.name, :class => (project == selected ? 'selected' : nil)) + s << link_to(text, project_path(project, :jump => jump), + :title => project.name, :class => (project == selected ? 'selected' : nil)) } - [ [bookmarked, :label_optgroup_bookmarks, true], [recents, :label_optgroup_recents, false], [projects, projects_label, true] ].each do |projects, label, is_tree| - next if projects.blank? - s << content_tag(:strong, l(label)) if is_tree project_tree(projects, &build_project_link)