diff options
Diffstat (limited to 'app/helpers/search_helper.rb')
| -rw-r--r-- | app/helpers/search_helper.rb | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 0ee76a51f7d..6cd8bded0f4 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -6,7 +6,7 @@ module SearchHelper resources_results = [ groups_autocomplete(term), - projects_autocomplete(term) + projects_autocomplete(term), ].flatten search_pattern = Regexp.new(Regexp.escape(term), "i") @@ -17,7 +17,7 @@ module SearchHelper [ resources_results, - generic_results + generic_results, ].flatten.uniq do |item| item[:label] end @@ -50,50 +50,50 @@ module SearchHelper # Autocomplete results for various settings pages def default_autocomplete [ - { category: "Settings", label: "User settings", url: profile_path }, - { category: "Settings", label: "SSH Keys", url: profile_keys_path }, - { category: "Settings", label: "Dashboard", url: root_path } + {category: "Settings", label: "User settings", url: profile_path}, + {category: "Settings", label: "SSH Keys", url: profile_keys_path}, + {category: "Settings", label: "Dashboard", url: root_path}, ] end # Autocomplete results for settings pages, for admins def default_autocomplete_admin [ - { category: "Settings", label: "Admin Section", url: admin_root_path } + {category: "Settings", label: "Admin Section", url: admin_root_path}, ] end # Autocomplete results for internal help pages def help_autocomplete [ - { category: "Help", label: "API Help", url: help_page_path("api/README") }, - { category: "Help", label: "Markdown Help", url: help_page_path("user/markdown") }, - { category: "Help", label: "Permissions Help", url: help_page_path("user/permissions") }, - { category: "Help", label: "Public Access Help", url: help_page_path("public_access/public_access") }, - { category: "Help", label: "Rake Tasks Help", url: help_page_path("raketasks/README") }, - { category: "Help", label: "SSH Keys Help", url: help_page_path("ssh/README") }, - { category: "Help", label: "System Hooks Help", url: help_page_path("system_hooks/system_hooks") }, - { category: "Help", label: "Webhooks Help", url: help_page_path("user/project/integrations/webhooks") }, - { category: "Help", label: "Workflow Help", url: help_page_path("workflow/README") } + {category: "Help", label: "API Help", url: help_page_path("api/README")}, + {category: "Help", label: "Markdown Help", url: help_page_path("user/markdown")}, + {category: "Help", label: "Permissions Help", url: help_page_path("user/permissions")}, + {category: "Help", label: "Public Access Help", url: help_page_path("public_access/public_access")}, + {category: "Help", label: "Rake Tasks Help", url: help_page_path("raketasks/README")}, + {category: "Help", label: "SSH Keys Help", url: help_page_path("ssh/README")}, + {category: "Help", label: "System Hooks Help", url: help_page_path("system_hooks/system_hooks")}, + {category: "Help", label: "Webhooks Help", url: help_page_path("user/project/integrations/webhooks")}, + {category: "Help", label: "Workflow Help", url: help_page_path("workflow/README")}, ] end # Autocomplete results for the current project, if it's defined def project_autocomplete - if @project && @project.repository.exists? && @project.repository.root_ref + if @project&.repository&.exists? && @project.repository.root_ref ref = @ref || @project.repository.root_ref [ - { category: "In this project", label: "Files", url: project_tree_path(@project, ref) }, - { category: "In this project", label: "Commits", url: project_commits_path(@project, ref) }, - { category: "In this project", label: "Network", url: project_network_path(@project, ref) }, - { category: "In this project", label: "Graph", url: project_graph_path(@project, ref) }, - { category: "In this project", label: "Issues", url: project_issues_path(@project) }, - { category: "In this project", label: "Merge Requests", url: project_merge_requests_path(@project) }, - { category: "In this project", label: "Milestones", url: project_milestones_path(@project) }, - { category: "In this project", label: "Snippets", url: project_snippets_path(@project) }, - { category: "In this project", label: "Members", url: project_project_members_path(@project) }, - { category: "In this project", label: "Wiki", url: project_wikis_path(@project) } + {category: "In this project", label: "Files", url: project_tree_path(@project, ref)}, + {category: "In this project", label: "Commits", url: project_commits_path(@project, ref)}, + {category: "In this project", label: "Network", url: project_network_path(@project, ref)}, + {category: "In this project", label: "Graph", url: project_graph_path(@project, ref)}, + {category: "In this project", label: "Issues", url: project_issues_path(@project)}, + {category: "In this project", label: "Merge Requests", url: project_merge_requests_path(@project)}, + {category: "In this project", label: "Milestones", url: project_milestones_path(@project)}, + {category: "In this project", label: "Snippets", url: project_snippets_path(@project)}, + {category: "In this project", label: "Members", url: project_project_members_path(@project)}, + {category: "In this project", label: "Wiki", url: project_wikis_path(@project)}, ] else [] @@ -107,9 +107,9 @@ module SearchHelper { category: "Groups", id: group.id, - label: "#{search_result_sanitize(group.full_name)}", + label: search_result_sanitize(group.full_name).to_s, url: group_path(group), - avatar_url: group.avatar_url || '' + avatar_url: group.avatar_url || "", } end end @@ -123,10 +123,10 @@ module SearchHelper { category: "Projects", id: p.id, - value: "#{search_result_sanitize(p.name)}", - label: "#{search_result_sanitize(p.full_name)}", + value: search_result_sanitize(p.name).to_s, + label: search_result_sanitize(p.full_name).to_s, url: project_path(p), - avatar_url: p.avatar_url || '' + avatar_url: p.avatar_url || "", } end end @@ -142,7 +142,7 @@ module SearchHelper project_id: params[:project_id], group_id: params[:group_id], scope: params[:scope], - repository_ref: params[:repository_ref] + repository_ref: params[:repository_ref], } options = exist_opts.merge(options) @@ -153,21 +153,21 @@ module SearchHelper opts = { id: "filtered-search-#{type}", - placeholder: 'Search or filter results...', + placeholder: "Search or filter results...", data: { - 'username-params' => UserSerializer.new.represent(@users) + "username-params" => UserSerializer.new.represent(@users), }, - autocomplete: 'off' + autocomplete: "off", } if @project.present? - opts[:data]['project-id'] = @project.id - opts[:data]['base-endpoint'] = project_path(@project) + opts[:data]["project-id"] = @project.id + opts[:data]["base-endpoint"] = project_path(@project) elsif @group.present? - opts[:data]['group-id'] = @group.id - opts[:data]['base-endpoint'] = group_canonical_path(@group) + opts[:data]["group-id"] = @group.id + opts[:data]["base-endpoint"] = group_canonical_path(@group) else - opts[:data]['base-endpoint'] = root_dashboard_path + opts[:data]["base-endpoint"] = root_dashboard_path end opts @@ -179,7 +179,7 @@ module SearchHelper elsif @group.present? @group.full_path else - 'dashboard' + "dashboard" end end @@ -195,7 +195,7 @@ module SearchHelper ) # Truncato's filtered_tags and filtered_attributes are not quite the same - sanitize(html, tags: %w(a p ol ul li pre code)) + sanitize(html, tags: %w[a p ol ul li pre code]) end def limited_count(count, limit = 1000) |