From 709af5bba072ef75c5ba61fe4182913de6d32d65 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Fri, 27 Feb 2015 12:50:39 +0100
Subject: [PATCH] Optim

---
 lib/Alchemy/Phrasea/Controller/Prod/Root.php | 5 ++++-
 templates/web/prod/index.html.twig           | 4 ++--
 templates/web/prod/thesaurus.js.twig         | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php
index 2475ed1d48..8c14998c7e 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php
@@ -102,10 +102,13 @@ class Root implements ControllerProviderInterface
                 }
             }
 
+            $helper = new Helper\Prod($app, $app['request']);
+
             return $app['twig']->render('prod/index.html.twig', [
                 'module_name'          => 'Production',
                 'WorkZone'             => new Helper\WorkZone($app, $app['request']),
-                'module_prod'          => new Helper\Prod($app, $app['request']),
+                'module_prod'          => $helper,
+                'search_datas'         => $helper->get_search_datas(),
                 'cssfile'              => $cssfile,
                 'module'               => 'prod',
                 'events'               => $app['events-manager'],
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 91cb7b0b6d..cd9f32192e 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -147,7 +147,7 @@
 {% endblock %}
 
 {% block content %}
-    {% set search_datas = module_prod.get_search_datas() %}
+
     <div style="position:absolute; top:0; left:0; right:0; bottom:0; background-color:#1a1a1a; z-index:32766;">
         <div id="loader" style="top:200px; margin:0 auto; -webkit-border-radius:5px; -moz-border-radius:5px; border-radius:5px; background-color:#CCCCCC; position:relative; margin:0 auto; text-align:center; width:400px; height:100px; padding:20px; z-index:32767;">
             <div style="margin:0 10px 10px; font-family:Helvetica,Arial,sans-serif; font-size:18px; color:#1A1A1A; text-align:left;">Phraseanet</div>
@@ -1154,7 +1154,7 @@
     {% endif %}
 
     <script type="text/javascript">
-        {% include "prod/thesaurus.js.twig" %}
+        {% include "prod/thesaurus.js.twig" with {'search_datas': search_datas} %}
     </script>
     <script type="text/javascript" src="{{ path('minifier', { 'g' : 'prod' }) }}"></script>
     <script type="text/javascript">
diff --git a/templates/web/prod/thesaurus.js.twig b/templates/web/prod/thesaurus.js.twig
index 2958ad8679..c2492e73f5 100644
--- a/templates/web/prod/thesaurus.js.twig
+++ b/templates/web/prod/thesaurus.js.twig
@@ -692,9 +692,9 @@ function Xclick(e)
                 var idx0 = lip.index(p4.thesau.lastClickedCandidate.item);
                 var idx1 = lip.index(li);
                 if(idx0 < idx1)
-                  lip.filter(function(index){return(index >= idx0 && index <idx1); }).addClass('selected');
+                  lip.filter(function(index){return(index >= idx0 && index < idx1); }).addClass('selected');
                 else
-                  lip.filter(function(index){return(index > idx1 && index <=idx0); }).addClass('selected');
+                  lip.filter(function(index){return(index > idx1 && index <= idx0); }).addClass('selected');
               }
             }
           }
@@ -1185,7 +1185,7 @@ function startThesaurus(){
 
   p4.thesau.thlist = {
     {% set first = 1 %}
-    {% for base in module_prod.get_search_datas['bases'] %}
+    {% for base in search_datas['bases'] %}
     {% if base['thesaurus'] %}
     {% if first == 0 %},{% endif %}
     "s{{base['sbas_id']}}": new ThesauThesaurusSeeker({{base['sbas_id']}})