From e40dac3ddc0aa0ccd555ff8695dba9575f5a68b0 Mon Sep 17 00:00:00 2001 From: DylanGuedes Date: Mon, 18 Jul 2016 13:01:18 +0000 Subject: [PATCH] Fixes plugin javascript to use & in regex and uses categories --- plugins/elasticsearch/helpers/elasticsearch_helper.rb | 2 +- plugins/elasticsearch/public/javascripts/categories.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/elasticsearch/helpers/elasticsearch_helper.rb b/plugins/elasticsearch/helpers/elasticsearch_helper.rb index 53aed65..8aa76c3 100644 --- a/plugins/elasticsearch/helpers/elasticsearch_helper.rb +++ b/plugins/elasticsearch/helpers/elasticsearch_helper.rb @@ -37,7 +37,7 @@ module ElasticsearchHelper def search_from_all_models begin filter = (params[:filter] || "" ).to_sym - query = get_query params[:query], sort_by: get_sort_by(filter) + query = get_query params[:query], sort_by: get_sort_by(filter), categories: params[:categories] Elasticsearch::Model.search(query,searchable_models, size: default_per_page(params[:per_page])).page(params[:page]).records rescue [] diff --git a/plugins/elasticsearch/public/javascripts/categories.js b/plugins/elasticsearch/public/javascripts/categories.js index 9906de1..6cad80e 100644 --- a/plugins/elasticsearch/public/javascripts/categories.js +++ b/plugins/elasticsearch/public/javascripts/categories.js @@ -4,8 +4,8 @@ var main = function() { var url = window.location.href; var indexOfCategories; - url = url.replace(/categories.*/g, ""); - url += "categories="; + url = url.replace(/&categories.*/g, ""); + url += "&categories="; $(".categories ul li input[checked]").map(function(idx, element) { categories.push(element.value); -- libgit2 0.21.2