From 9788a2a81264965374603d5d9d0d708f1bedb389 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Tue, 30 Dec 2014 16:46:34 +0100
Subject: [PATCH] Fix elastic search sort query

---
 .../Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php   | 5 ++++-
 templates/web/prod/index.html.twig                         | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
index 4a43151f5a..1ba3a76ca6 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
@@ -552,10 +552,13 @@ class ElasticSearchEngine implements SearchEngineInterface
     private function createSortQueryParams(SearchEngineOptions $options)
     {
         $sort = [];
+
         if ($options->getSortBy() === SearchEngineOptions::SORT_RELEVANCE) {
             $sort['_score'] = $options->getSortOrder();
-        } else {
+        } elseif ($options->getSortBy() === SearchEngineOptions::SORT_CREATED_ON) {
             $sort['created_on'] = $options->getSortOrder();
+        } else {
+            $sort[sprintf('caption.%s', $options->getSortBy())] = $options->getSortOrder();
         }
 
         return $sort;
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index ff93c1106e..45a8863c35 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -337,11 +337,14 @@
                                             </div>
 
                                             <span>{{ 'Trier par' | trans }}</span>
-                                            <select name="sort" class="input-small">
-                                                <option value="" {% if app['phraseanet.SE'].getDefaultSort() is empty %}selected="selected default-selection"{% endif %}>{{ "No sort"|trans }}</option>
+                                            <select name="sort" class="input-medium">
+                                                <option value="{{ constant('\\Alchemy\\Phrasea\\SearchEngine\\SearchEngineOptions::SORT_CREATED_ON') }}" {% if app['phraseanet.SE'].getDefaultSort() is empty %}selected="selected default-selection"{% endif %}>{{ "Date Added"|trans }}</option>
+                                                <option value="{{ constant('\\Alchemy\\Phrasea\\SearchEngine\\SearchEngineOptions::SORT_RELEVANCE') }}" {% if app['phraseanet.SE'].getDefaultSort() is empty %}selected="selected default-selection"{% endif %}>{{ "Relevance"|trans }}</option>
+                                                <optgroup label="{{ 'By field'|trans }}">
                                                 {% for sort in search_datas['sort'] %}
                                                     <option value="{{ sort.fieldname }}" {% if sort.fieldname == app['phraseanet.SE'].getDefaultSort() %}selected="selected default-selection"{% endif %}>{{ sort.fieldname }}</option>
                                                 {% endfor %}
+                                                </optgroup>
                                             </select>
                                             <select name="ord" class="input-medium">
                                                 {% for ord, ord_name in app['phraseanet.SE'].getAvailableOrder() %}