scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-10 15:14:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #149 from mlorb/ml_sci_420

Browse source 
fixes links and missing experiment level in search results [SCI-420]
This commit is contained in:
mlorb 2016-09-14 15:42:16 +02:00 • committed by GitHub
commit 098e17c0d8
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/search/results/_assets.html.erb
View file

@ -35,6 +35,12 @@
locals: { my_module: asset.step.protocol.my_module } %>
</span>
<br>
<span>
<%=t "search.index.experiment" %>
<%= render partial: "search/results/partials/experiment_text.html.erb",
locals: { experiment: asset.step.protocol.my_module.experiment } %>
</span>
<br>
<span>
<%=t "search.index.project" %>
<%= render partial: "search/results/partials/project_text.html.erb",
@ -75,7 +81,7 @@
<span>
<%=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 } %>
</span>
<br>
<span>

8
app/views/search/results/_tables.html.erb
View file

@ -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 } %>
</span>
<br>
<span>
<%=t "search.index.experiment" %>
<%= render partial: "search/results/partials/experiment_text.html.erb",
locals: { experiment: table.result.my_module.experiment } %>
</span>
<br>
<span>
<%=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 } %>
</span>
<br>
<span>

9
app/views/search/results/partials/_tag_text.html.erb
View file

@ -1,10 +1,3 @@
<% query ||= nil %>
<% text = query.present? ? highlight(tag.name, query.strip.split(/\s+/)) : tag.name %>
<% if can_view_project(tag.project) %>
<a href="<%= project_path(tag.project) %>">
<%= text %>
</a>
<% else %>
<%= text %>
<% end %>
<%= text %>