Fix #878 Add delete from basket button in detailled view

lib/Doctrine/Entities/Basket.php

@@ -405,6 +405,20 @@ class Basket
         return false;
     }
 
+    public function getBasketElementFromRecord(Application $app, \record_adapter $record)
+    {
+        foreach ($this->getElements() as $basket_element) {
+            $bask_record = $basket_element->getRecord($app);
+
+            if ($bask_record->get_record_id() == $record->get_record_id()
+                && $bask_record->get_sbas_id() == $record->get_sbas_id()) {
+                return $basket_element;
+            }
+        }
+
+        return null;
+    }
+
     public function getSize(Application $app)
     {
         $totSize = 0;
@@ -433,7 +447,7 @@ class Basket
     public function addElement(\Entities\BasketElement $elements)
     {
         $this->elements[] = $elements;
-    
+
         return $this;
     }
 

templates/web/prod/preview/basket_train.html.twig

@@ -40,4 +40,4 @@
   </div>
   <div id="PREVIEWTOOL">
   {% include 'prod/preview/tools.html.twig' %}
-  </div>
+  </div>

templates/web/prod/preview/tools.html.twig

@@ -5,6 +5,18 @@
        onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div>
 {% endif %}
 
+{% if record.is_from_basket() and app['authentication'].getUser().ACL().has_right_on_base(record.get_base_id(), 'canputinalbum') %}
+    {% set basketElement = record.get_container().getBasketElementFromRecord(app, record) %}
+    {% if basketElement is not none %}
+        <a sbas="{{record.get_sbas_id()}}" id="PREV_BASKDEL_{{record.get_serialize_key}}"
+           class="baskDeleter WorkZoneElementRemover" title="{% trans 'Remove from basket' %}"
+           data-context="reg_train_basket"
+           onclick="remove_from_basket($(this), false);return false;"
+           href="{{ path('prod_baskets_basket_element_remove', { 'basket_id' :  record.get_container().getId(), 'basket_element_id' : basketElement.getId()}) }}">
+        </a>
+    {% endif %}
+{% endif %}
+
   <div class="printer" title="'{% trans 'action : print' %}"
        onclick="evt_print('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
 

www/skins/prod/000000/prodcolor.css

@@ -517,7 +517,7 @@ span.ww_winTitle {
 /******* PRESENTATION DE MINIATURES *******************************************/
 
 .captionRolloverTips, .previewTips, .infoTips,
-.baskAdder, .printer, .downloader {
+.baskAdder, .printer, .downloader, .baskDeleter {
     background-image: url('../../icons/zoom.gif');
     background-repeat: no-repeat;
     background-position: center center;
@@ -539,6 +539,10 @@ span.ww_winTitle {
     background-image: url('../../icons/basket.gif');
 }
 
+.baskDeleter {
+    background-image: url('../../icons/delete.gif');
+}
+
 .printer {
     background-image: url('../../icons/print.gif');
 }
@@ -731,8 +735,9 @@ div.diapo {
     background-color:  transparent;
     border: none;
     width: 16px;
-    height: 16px;
+    height: 22px;
     cursor: pointer;
+    padding: 0px;
 }
 
 #idFrameC #baskets .alert_datas_changed {

www/skins/prod/959595/prodcolor.css

@@ -565,6 +565,10 @@ span.ww_winTitle {
     background-image: url('../../icons/basket.gif');
 }
 
+.baskDeleter {
+    background-image: url('../../icons/delete.gif');
+}
+
 .printer {
     background-image: url('../../icons/print.gif');
 }
@@ -761,8 +765,9 @@ div.diapo {
     background-color: transparent;
     border: none;
     width: 16px;
-    height: 16px;
+    height: 22px;
     cursor: pointer;
+    padding: 0px;
 }
 
 #idFrameC #baskets .alert_datas_changed {

www/skins/prod/jquery.Prod.js

@@ -34,4 +34,4 @@
             return false;
         });
     });
-}());
+}());

www/skins/prod/jquery.main-prod.js

@@ -2502,6 +2502,12 @@ function evt_add_in_chutier(sbas_id, record_id,event, singleSelection)
     p4.WorkZone.addElementToBasket(sbas_id, record_id, event, singleSelection);
 }
 
+function remove_from_basket(el, confirm)
+{
+    var confirm = confirm || false;
+    p4.WorkZone.removeElementFromBasket(el, confirm);
+}
+
 
 function doSpecialSearch(qry, allbase){
     if (allbase) {