diff --git a/app/assets/javascripts/application/search.js b/app/assets/javascripts/application/search.js index 5cdb19e19e52e4d19b488b6cd27c16d4da81ee56..f96012935f21c3c80f2dccc65752b4bfd97d76dd 100644 --- a/app/assets/javascripts/application/search.js +++ b/app/assets/javascripts/application/search.js @@ -159,10 +159,10 @@ var search = function() { $(document).on('submit', '.search-input form', function (event) { event.preventDefault(); params.reset(); - // params.remove('query', params.get('query')); params.add('query', $('input[name="query"]', this).val()); - // params.remove('search_class', params.get('search_class')); - params.add('search_class', $('select[name="search_class"]', this).val()); + var search_class = $('select[name="search_class"]', this).val() + params.add('search_class', search_class); + $("#search_class").val(search_class); searchFetch(); }); } diff --git a/app/views/search/_fetch.html.erb b/app/views/search/_fetch.html.erb index dd7384b56e05e66b962f05fc84a3cd9526622509..4a9137a339a50a5076ec63ae6a03558903798b21 100644 --- a/app/views/search/_fetch.html.erb +++ b/app/views/search/_fetch.html.erb @@ -3,3 +3,11 @@ <%= render @result, orientation: "horizontal" %> <%= paginate @result %> </div> + +<script type="text/javascript"> + if($("#search_class").val() != "LearningObject"){ + $('.search-sidebar').hide(); + }else{ + $('.search-sidebar').show(); + } +</script> diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb index 7b1d1363e660b456cf73e4391c2b67b20c5ce553..7445798f8d91238092337765c86673885034f529 100644 --- a/app/views/shared/application/_header.html.erb +++ b/app/views/shared/application/_header.html.erb @@ -38,9 +38,9 @@ <div class="search-input"> <form action="/search" method="get"> <div class="input-group" id="search"> - <input type="text" placeholder="buscar em <%= number_with_delimiter(LearningObject.count, delimiter: ".") %> objetos" class="form-control" name="query" id="main_search"> + <input type="text" placeholder="buscar em <%= number_with_delimiter(LearningObject.count, delimiter: ".") %> conteúdos" class="form-control" name="query" id="main_search"> <select name="search_class" id="search_class" class="form-control"> - <option value="LearningObject" selected>Objetos Educacionais</option> + <option value="LearningObject" selected>Conteúdos Educacionais</option> <option value="Collection">Coleções</option> <option value="User">Usuários</option> </select> @@ -49,6 +49,7 @@ </div> </div> </form> + <input type="hidden" id="search_class" value=""/> </div> </div>