From 90633ee61f3da9179a7cc8735034528a44bb7be7 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 13 Mar 2012 11:41:57 +0100
Subject: [PATCH 1/2] Fix add in basket

---
 www/client/answer.php             | 2 +-
 www/client/baskets.php            | 4 ++--
 www/client/index.php              | 2 +-
 www/client/jquery.p4client.1.0.js | 4 ++--
 www/prod/page0.js                 | 4 ++++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/www/client/answer.php b/www/client/answer.php
index e121d22376..4a1a781490 100644
--- a/www/client/answer.php
+++ b/www/client/answer.php
@@ -431,7 +431,7 @@ $npages = $result->get_total_pages();
             <?php
                 if ($ACL->has_right_on_base($record->get_base_id(), "canputinalbum"))
                 {
-            ?><div class="baskAdder" title="<?php echo _('action : ajouter au panier') ?>" onClick="evt_add_in_chutier('<?php echo $record->get_base_id() ?>', '<?php echo $record->get_record_id() ?>');"></div><?php
+            ?><div class="baskAdder" title="<?php echo _('action : ajouter au panier') ?>" onClick="evt_add_in_chutier('<?php echo $record->get_sbas_id() ?>', '<?php echo $record->get_record_id() ?>');"></div><?php
                 }
                 if ($mod_col != '1')
                 {
diff --git a/www/client/baskets.php b/www/client/baskets.php
index 00d37489c5..7d8eb6636a 100644
--- a/www/client/baskets.php
+++ b/www/client/baskets.php
@@ -21,7 +21,7 @@ $session = $appbox->get_session();
 $usr_id = $session->get_usr_id();
 
 $request = http_request::getInstance();
-$parm = $request->get_parms("bas", "courChuId", "act", "p0", "first");
+$parm = $request->get_parms("sbas", "courChuId", "act", "p0", "first");
 
 $parm['p0'] = utf8_decode($parm['p0']);
 
@@ -41,7 +41,7 @@ if ($parm["act"] == "DELIMG" && $parm["p0"] != "")
 if ($parm["act"] == "ADDIMG" && ($parm["p0"] != "" && $parm["p0"] != null))
 {
   $basket = basket_adapter::getInstance($appbox, $parm['courChuId'], $user->get_id());
-  $sbas_id = phrasea::sbasFromBas($parm['bas']);
+  $sbas_id = (int) $parm['sbas'];
   $record = new record_adapter($sbas_id, $parm['p0']);
   $basket->push_element($record, false, false);
   unset($record);
diff --git a/www/client/index.php b/www/client/index.php
index a88d29b051..e94215a179 100644
--- a/www/client/index.php
+++ b/www/client/index.php
@@ -588,7 +588,7 @@ if ($cssfile)
                         </form>
                         <div id="dialog_dwnl" title="<?php echo _('action : exporter') ?>" style="display:none;z-index12000;"></div>
                         <form name="formChu" id="formChu" action="./baskets.php" method="post" style="visibility:hidden; display:none" >
-                          <input type="hidden" name="bas" id="formChubas" value="">
+                          <input type="hidden" name="sbas" id="formChubas" value="">
                           <input type="hidden" name="act" id="formChuact" value="">
                           <input type="hidden" name="p0"  id="formChup0" value="">
                           <input type="hidden" name="ssel_id" value="">
diff --git a/www/client/jquery.p4client.1.0.js b/www/client/jquery.p4client.1.0.js
index 01bce8cdc0..462e1f5773 100644
--- a/www/client/jquery.p4client.1.0.js
+++ b/www/client/jquery.p4client.1.0.js
@@ -632,8 +632,8 @@ function clktri(id){
  * CHUTIER
  **************/
 
-function evt_add_in_chutier(base_id, record_id){
-	$('#formChubas')[0].value = base_id;
+function evt_add_in_chutier(sbas_id, record_id){
+	$('#formChubas')[0].value = sbas_id;
 	$('#formChuact')[0].value = "ADDIMG";
 	$('#formChup0')[0].value = record_id;
 	$('#formChu').submit();
diff --git a/www/prod/page0.js b/www/prod/page0.js
index 6635c3e383..8fbd2689fc 100644
--- a/www/prod/page0.js
+++ b/www/prod/page0.js
@@ -281,6 +281,7 @@ function dropOnBask(event,from,destKey)
   {
     sselcont = [];
     lstbr = p4.sel.join(';');
+      console.log(from, $(from).hasClass('baskAdder'));
     if($(from).hasClass('baskAdder'))
       lstbr = $(from).attr('id').split('_').slice(2,4).join('_');
   }
@@ -3352,7 +3353,10 @@ function evt_print(value)
 function evt_add_in_chutier(a,b,event,el)
 {
   if($('#baskets .SSTT.active').length == 1)
+  {
+    console.log('evaluating', '#PREV_BASKADD_'+a+'_'+b);
     dropOnBask(event,$('#PREV_BASKADD_'+a+'_'+b),$('#baskets .SSTT.active'));
+  }
 }
 
 

From fc4e1b3d91759f284a8e2703167e395c0aae1dcb Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 13 Mar 2012 11:44:25 +0100
Subject: [PATCH 2/2] Fix add in basket

---
 templates/web/common/drop_down_options.html | 2 +-
 templates/web/prod/preview/tools.html       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/web/common/drop_down_options.html b/templates/web/common/drop_down_options.html
index 77fa742bad..8ef7c1a649 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') %}
               <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_sbas_id}}','{{record.get_record_id}}',false,this);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..ad246db4ef 100644
--- a/templates/web/prod/preview/tools.html
+++ b/templates/web/prod/preview/tools.html
@@ -1,14 +1,14 @@
 
 {% 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>
+       class="baskAdder" title="{% trans 'action : ajouter au panier' %}"
+       onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div>
 {% endif %}
 
-  <div class="printer" title="'{% trans 'action : print' %}" 
+  <div class="printer" title="'{% trans 'action : print' %}"
        onclick="evt_print('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
 
 {% if user.ACL().has_right_on_base(record.get_base_id(), 'candwnldhd') or user.ACL().has_right_on_base(record.get_base_id(), 'candwnldpreview') %}
-    <div class="downloader" title="{% trans 'action : exporter' %}" 
+    <div class="downloader" title="{% trans 'action : exporter' %}"
     onclick="evt_dwnl('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
 {% endif %}