Commit e40dac3ddc0aa0ccd555ff8695dba9575f5a68b0

Authored by Dylan Guedes
Committed by Macartur Sousa
1 parent fd8b8b28

Fixes plugin javascript to use & in regex and uses categories

Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
plugins/elasticsearch/helpers/elasticsearch_helper.rb
... ... @@ -37,7 +37,7 @@ module ElasticsearchHelper
37 37 def search_from_all_models
38 38 begin
39 39 filter = (params[:filter] || "" ).to_sym
40   - query = get_query params[:query], sort_by: get_sort_by(filter)
  40 + query = get_query params[:query], sort_by: get_sort_by(filter), categories: params[:categories]
41 41 Elasticsearch::Model.search(query,searchable_models, size: default_per_page(params[:per_page])).page(params[:page]).records
42 42 rescue
43 43 []
... ...
plugins/elasticsearch/public/javascripts/categories.js
... ... @@ -4,8 +4,8 @@ var main = function() {
4 4 var url = window.location.href;
5 5 var indexOfCategories;
6 6  
7   - url = url.replace(/categories.*/g, "");
8   - url += "categories=";
  7 + url = url.replace(/&categories.*/g, "");
  8 + url += "&categories=";
9 9  
10 10 $(".categories ul li input[checked]").map(function(idx, element) {
11 11 categories.push(element.value);
... ...