From 1953e295b6c1162b5e1d70c549eaacd23f083af0 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Thu, 28 Jul 2016 13:29:26 +0200 Subject: [PATCH] Hotfix for search results bug --- app/views/search/results/_projects.html.erb | 2 +- app/views/search/results/_workflows.html.erb | 3 +-- app/views/search/results/partials/_project_text.html.erb | 2 +- app/views/search/results/partials/_result_text.html.erb | 1 + app/views/search/results/partials/_step_text.html.erb | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/search/results/_projects.html.erb b/app/views/search/results/_projects.html.erb index db0bc1763..e972da51e 100644 --- a/app/views/search/results/_projects.html.erb +++ b/app/views/search/results/_projects.html.erb @@ -2,7 +2,7 @@
<%= render partial: "search/results/partials/project_text.html.erb", - locals: { project: project, query: search_query, link_to_page: :canvas } %> + locals: { project: project, query: search_query } %>

diff --git a/app/views/search/results/_workflows.html.erb b/app/views/search/results/_workflows.html.erb index e5c3164ac..d343608e8 100644 --- a/app/views/search/results/_workflows.html.erb +++ b/app/views/search/results/_workflows.html.erb @@ -12,8 +12,7 @@
<%=t "search.index.project" %> - <%= render partial: "search/results/partials/project_text.html.erb", - locals: { project: workflow.project, link_to_page: :canvas } %> + <%= render partial: "search/results/partials/project_text.html.erb", locals: { project: workflow.project } %>
diff --git a/app/views/search/results/partials/_project_text.html.erb b/app/views/search/results/partials/_project_text.html.erb index 03451eb41..04fd2040a 100644 --- a/app/views/search/results/partials/_project_text.html.erb +++ b/app/views/search/results/partials/_project_text.html.erb @@ -1,4 +1,4 @@ -<% link_to_page = :root if local_assigns[:link_to_page].nil? %> +<% link_to_page = :canvas if local_assigns[:link_to_page].nil? %> <% query ||= nil %> <% text = query.present? ? highlight(project.name, query.strip.split(/\s+/)) : project.name %> diff --git a/app/views/search/results/partials/_result_text.html.erb b/app/views/search/results/partials/_result_text.html.erb index 3bc51c75d..08719ea16 100644 --- a/app/views/search/results/partials/_result_text.html.erb +++ b/app/views/search/results/partials/_result_text.html.erb @@ -1,3 +1,4 @@ +<% target = nil if local_assigns[:target].nil? %> <% query ||= nil %> <% text = query.present? ? highlight(result.name, query.strip.split(/\s+/)) : result.name %> diff --git a/app/views/search/results/partials/_step_text.html.erb b/app/views/search/results/partials/_step_text.html.erb index 3f2307984..871a79afa 100644 --- a/app/views/search/results/partials/_step_text.html.erb +++ b/app/views/search/results/partials/_step_text.html.erb @@ -1,3 +1,4 @@ +<% target = nil if local_assigns[:target].nil? %> <% query ||= nil %> <% text = query.present? ? highlight(step.name, query.strip.split(/\s+/)) : step.name %>