From 88287b07caae5655a507b6716b6d9f6865744811 Mon Sep 17 00:00:00 2001
From: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
Date: Thu, 25 Feb 2016 11:52:20 -0300
Subject: [PATCH] Filters show only when searching on Learning Objects
Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
---
app/assets/javascripts/application/search.js | 6 +++---
app/views/search/_fetch.html.erb | 8 ++++++++
app/views/shared/application/_header.html.erb | 5 +++--
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/application/search.js b/app/assets/javascripts/application/search.js
index 5cdb19e19..f96012935 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 dd7384b56..4a9137a33 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 7b1d1363e..7445798f8 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>
--
GitLab