From 7b0e8633afd1d7d3a773fec718bb1ba1a42e555c Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff@alchemy.fr>
Date: Tue, 28 Feb 2012 19:40:12 +0100
Subject: [PATCH] fix #459 Fonction d'ajout au panier via la vignette

---
 templates/web/common/drop_down_options.html |  2 +-
 templates/web/prod/preview/tools.html       |  2 +-
 templates/web/prod/results/record.html      |  2 +-
 www/prod/jquery.WorkZone.js                 | 20 +++++++++++++-------
 www/prod/page0.js                           |  6 +++---
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/templates/web/common/drop_down_options.html b/templates/web/common/drop_down_options.html
index 3069c422bb..d07ca3b41a 100644
--- a/templates/web/common/drop_down_options.html
+++ b/templates/web/common/drop_down_options.html
@@ -10,7 +10,7 @@
               {% if user.ACL.has_right_on_base(record.get_base_id, 'canputinalbum') and not record.is_grouping() %}
               <div title="" class="context-menu-item">
                 <div class="context-menu-item-inner"
-                     onclick="evt_add_in_chutier('{{record.get_base_id}}','{{record.get_record_id}}',false,this);return(false);">
+                     onclick="evt_add_in_chutier('{{record.get_base_id}}','{{record.get_record_id}}',false,true);return(false);">
                   {% trans 'action : ajouter au panier' %}
                 </div>
               </div>
diff --git a/templates/web/prod/preview/tools.html b/templates/web/prod/preview/tools.html
index 2f5fda19f3..e9888ad449 100644
--- a/templates/web/prod/preview/tools.html
+++ b/templates/web/prod/preview/tools.html
@@ -2,7 +2,7 @@
 {% if (record.is_from_basket is empty) and user.ACL().has_right_on_base(record.get_base_id(), 'canputinalbum') %}
   <div sbas="{{record.get_sbas_id()}}" id="PREV_BASKADD_{{record.get_serialize_key}}"
        class="baskAdder" title="{% trans 'action : ajouter au panier' %}" 
-       onclick="evt_add_in_chutier('{{record.get_base_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div>
+       onclick="evt_add_in_chutier('{{record.get_base_id()}}','{{record.get_record_id()}}',false);return(false);"></div>
 {% endif %}
 
   <div class="printer" title="'{% trans 'action : print' %}" 
diff --git a/templates/web/prod/results/record.html b/templates/web/prod/results/record.html
index 1629709fa6..4cc47df8de 100644
--- a/templates/web/prod/results/record.html
+++ b/templates/web/prod/results/record.html
@@ -7,7 +7,7 @@
   {% if entry_id %}
     <div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}"
          id="{{ prefix|default('IMGT') }}_{{record.get_sbas_id}}_{{record.get_record_id}}"
-         class="IMGT diapo grouping type-{{record.get_type}}"
+         class="IMGT diapo type-{{record.get_type}}"
          onDblClick="openPreview('FEED',{{record.get_number()}},{{entry_id}});">
   {% elseif record.is_grouping() %}
     <div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}"
diff --git a/www/prod/jquery.WorkZone.js b/www/prod/jquery.WorkZone.js
index bc2fc8f83e..02ec057545 100644
--- a/www/prod/jquery.WorkZone.js
+++ b/www/prod/jquery.WorkZone.js
@@ -378,12 +378,7 @@ var p4 = p4 || {};
   }
 
 
-
-
-
-
-
-  function dropOnBask(event,from,destKey)
+  function dropOnBask(event,from,destKey, singleSelection)
   {
     var action = "",
     from = $(from), dest_uri = '', lstbr = [],
@@ -420,10 +415,14 @@ var p4 = p4 || {};
 
     if(action=="IMGT2CHU" || action=="IMGT2REG")
     {
-      if($(from).hasClass('.baskAdder'))
+      if($(from).hasClass('.baskAdder') )
       {
         lstbr = [$(from).attr('id').split('_').slice(2,4).join('_')];
       }
+      else if(singleSelection)
+      {
+        lstbr = [$(from).attr('id').split('_').slice(1,3).join('_') ];
+      }
       else
       {
         lstbr = p4.Results.Selection.get();
@@ -570,6 +569,13 @@ var p4 = p4 || {};
     p4.WorkZone = {
       'Selection':new Selectable($('#baskets'), {selector : '.CHIM'}),
       'refresh':refreshBaskets,
+      'addElementToBasket': function(sbas_id, record_id, event , singleSelection) {
+        singleSelection = !!singleSelection || false;
+        if($('#baskets .SSTT.active').length == 1)
+        {
+          return dropOnBask(event,$('#IMGT_'+ sbas_id +'_'+ record_id), $('#baskets .SSTT.active'), singleSelection);
+        }
+      },
       'reloadCurrent':function(){
         var sstt = $('#baskets .content:visible');
         if(sstt.length === 0)
diff --git a/www/prod/page0.js b/www/prod/page0.js
index 638927f31a..cb7d4744fb 100644
--- a/www/prod/page0.js
+++ b/www/prod/page0.js
@@ -2582,10 +2582,10 @@ function evt_print(value)
   printThis("lst="+value);
 }
 
-function evt_add_in_chutier(a,b,event,el)
+function evt_add_in_chutier(sbas_id, record_id,event, singleSelection)
 {
-  if($('#baskets .SSTT.active').length == 1)
-    dropOnBask(event,$('#PREV_BASKADD_'+a+'_'+b),$('#baskets .SSTT.active'));
+  var singleSelection = singleSelection || false;
+  p4.WorkZone.addElementToBasket(sbas_id, record_id, event, singleSelection);
 }