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

remove samples from search

Browse source
This commit is contained in:
zmagod 2018-04-26 14:25:02 +02:00
parent de6c40a921
commit ca539cdce8
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/search_controller.rb
View file

@ -17,7 +17,6 @@ class SearchController < ApplicationController
search_protocols if @search_category == :protocols search_protocols if @search_category == :protocols
search_steps if @search_category == :steps search_steps if @search_category == :steps
search_checklists if @search_category == :checklists search_checklists if @search_category == :checklists
search_samples if @search_category == :samples
if @search_category == :repositories && params[:repository] if @search_category == :repositories && params[:repository]
search_repository search_repository
end end
@ -254,12 +253,6 @@ class SearchController < ApplicationController
@search_count = @checklist_search_count @search_count = @checklist_search_count
end end
def search_samples
@sample_results = []
@sample_results = search_by_name(Sample) if @sample_search_count > 0
@search_count = @sample_search_count
end
def search_repository def search_repository
@repository = Repository.find_by_id(params[:repository]) @repository = Repository.find_by_id(params[:repository])
render_403 unless can_read_team?(@repository.team) render_403 unless can_read_team?(@repository.team)

17
app/views/search/index.html.erb
View file

@ -170,20 +170,6 @@
<%= t'Checklists' %> <%= t'Checklists' %>
</a> </a>
</li> </li>
<li role="presentation"
class="
<%= "active" if @search_category.present? and @search_category == :samples %>
<%= "disabled" if @sample_search_count == 0 %>"
>
<a href="?<%= {category: 'samples', q: @search_query,
whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
match_case: @search_case, utf8: '✓',
search_id: @search_id}.to_query %>">
<span class="badge pull-right"><%= @sample_search_count %></span>
<span class="glyphicon glyphicon-tint"></span>
<%= t'Samples' %>
</a>
</li>
<li role="presentation" <li role="presentation"
class=" class="
@ -290,9 +276,6 @@
<% if @search_category == :checklists and @checklist_search_count > 0 %> <% if @search_category == :checklists and @checklist_search_count > 0 %>
<%= render 'search/results/checklists', search_query: @search_query, results: @checklist_results %> <%= render 'search/results/checklists', search_query: @search_query, results: @checklist_results %>
<% end %> <% end %>
<% if @search_category == :samples and @sample_search_count > 0 %>
<%= render 'search/results/samples', search_query: @search_query, results: @sample_results %>
<% end %>
<% if @search_category == :repositories and @repository_search_count_total > 0 %> <% if @search_category == :repositories and @repository_search_count_total > 0 %>
<%= render 'search/results/repositories', search_query: @search_query, results: @repository_results, repository: @repository %> <%= render 'search/results/repositories', search_query: @search_query, results: @repository_results, repository: @repository %>
<% end %> <% end %>