Fixing search using sort by

Signed-off-by: Macartur Sousa <macartur.sc@gmail.com> Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>

Fixing search using sort by
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com> Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
Macartur Sousa
1 parent 9adc4947
Showing 3 changed files with 14 additions and 12 deletions Show diff stats
plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb
plugins/elasticsearch/helpers/elasticsearch_helper.rb
plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
@@ -27,6 +27,6 @@ class ElasticsearchPluginController &lt; ApplicationController
   def define_search_fields_types
     @search_filter_types = ElasticsearchHelper::search_filters
-    @selected_filter_field = (params[:selected_filter_field])
+    @selected_filter_field = (params[:selected_filter_field] || :relevance).to_sym
   end
 end
@@ -13,9 +13,9 @@ module ElasticsearchHelper
   def self.search_filters
     {
-     :lexical => { label: _("Alphabetical Order")},
-     :recent => { label: _("More Recent Order")},
-     :access => { label: _("More accessed")}
+     :relevance => { label: _("Relevance")},
+     :lexical   => { label: _("Alphabetical")},
+     :recent    => { label: _("More Recent")},
     }
   end
@@ -35,10 +35,10 @@ module ElasticsearchHelper
   def get_sort_by sort_by
     case sort_by
-    when "lexical"
-      "name.raw"
-    when "recent"
-      "created_at"
+      when "lexical"
+        { "name.raw" => {"order" => "asc" }}
+      when "recent"
+        { "created_at" => {"order" => "desc"}}
     end
   end
@@ -105,9 +105,9 @@ module ElasticsearchHelper
     query = {
       query: query_method(text, fields)
     }
-    if sort_by
-      query[:sort] = sort_by
-    end
+
+    query[:sort] = [sort_by,"_score"] if sort_by
+
     query
   end
@@ -14,7 +14,9 @@
       <h3 class="box-title"><%= _("Sort by") %></h3>
       <ul>
         <% for type, value in @search_filter_types %>
-          <li><%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&selected_filter_field=#{type}" %></li>
+          <li class="select-search-type <%= "active" if type == @selected_filter_field %>">
+            <%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&selected_filter_field=#{type}" %>
+          </li>
         <% end %>
       </ul>
     </div>
	@@ -27,6 +27,6 @@ class ElasticsearchPluginController < ApplicationController		@@ -27,6 +27,6 @@ class ElasticsearchPluginController < ApplicationController
27		27
28	def define_search_fields_types	28	def define_search_fields_types
29	@search_filter_types = ElasticsearchHelper::search_filters	29	@search_filter_types = ElasticsearchHelper::search_filters
30	- @selected_filter_field = (params[:selected_filter_field])	30	+ @selected_filter_field = (params[:selected_filter_field] \|\| :relevance).to_sym
31	end	31	end
32	end	32	end