From 36378d03e2bc7ac709bb3613397c8a91ab2328c4 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Tue, 13 Sep 2016 17:13:58 +0200 Subject: [PATCH] fixes links and missing experiment level in search results --- app/views/search/results/_assets.html.erb | 8 +++++++- app/views/search/results/_tables.html.erb | 8 +++++++- app/views/search/results/partials/_tag_text.html.erb | 9 +-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/views/search/results/_assets.html.erb b/app/views/search/results/_assets.html.erb index 37313ef31..e8589e92b 100644 --- a/app/views/search/results/_assets.html.erb +++ b/app/views/search/results/_assets.html.erb @@ -35,6 +35,12 @@ locals: { my_module: asset.step.protocol.my_module } %>
+ + <%=t "search.index.experiment" %> + <%= render partial: "search/results/partials/experiment_text.html.erb", + locals: { experiment: asset.step.protocol.my_module.experiment } %> + +
<%=t "search.index.project" %> <%= render partial: "search/results/partials/project_text.html.erb", @@ -75,7 +81,7 @@ <%=t "search.index.project" %> <%= render partial: "search/results/partials/project_text.html.erb", - locals: { project: asset.result.my_module.experiment.project } %> + locals: { project: asset.result.my_module.experiment.project, link_to_page: :show } %>
diff --git a/app/views/search/results/_tables.html.erb b/app/views/search/results/_tables.html.erb index 4f328dbc9..5da04e853 100644 --- a/app/views/search/results/_tables.html.erb +++ b/app/views/search/results/_tables.html.erb @@ -62,11 +62,17 @@ <%= render partial: "search/results/partials/my_module_text.html.erb", locals: { my_module: table.result.my_module, link_to_page: :results } %> +
+ + <%=t "search.index.experiment" %> + <%= render partial: "search/results/partials/experiment_text.html.erb", + locals: { experiment: table.result.my_module.experiment } %> +
<%=t "search.index.project" %> <%= render partial: "search/results/partials/project_text.html.erb", - locals: { project: table.result.my_module.experiment.project } %> + locals: { project: table.result.my_module.experiment.project, link_to_page: :show } %>
diff --git a/app/views/search/results/partials/_tag_text.html.erb b/app/views/search/results/partials/_tag_text.html.erb index 9c6600a15..47a60e07a 100644 --- a/app/views/search/results/partials/_tag_text.html.erb +++ b/app/views/search/results/partials/_tag_text.html.erb @@ -1,10 +1,3 @@ <% query ||= nil %> <% text = query.present? ? highlight(tag.name, query.strip.split(/\s+/)) : tag.name %> - -<% if can_view_project(tag.project) %> - - <%= text %> - -<% else %> - <%= text %> -<% end %> +<%= text %> \ No newline at end of file