Merge branch 'fix_878' of https://github.com/nlegoff/Phraseanet into nlegoff-fix_878

lib/Doctrine/Entities/Basket.php

@@ -433,7 +433,7 @@ class Basket
     public function addElement(\Entities\BasketElement $elements)
     {
         $this->elements[] = $elements;
-    
+
         return $this;
     }
 

lib/classes/record/preview.php

@@ -80,6 +80,8 @@ class record_preview extends record_adapter
      */
     protected $download_popularity;
 
+    protected $original_item;
+
     /**
      *
      * @param Application           $app
@@ -110,6 +112,7 @@ class record_preview extends record_adapter
                 }
                 foreach ($results->getResults() as $record) {
                     $number = $pos;
+                    $this->original_item = $record;
                     $sbas_id = $record->get_sbas_id();
                     $record_id = $record->get_record_id();
                     break;
@@ -121,6 +124,7 @@ class record_preview extends record_adapter
                 $record_id = $contId[1];
 
                 $this->container = new record_adapter($app, $sbas_id, $record_id);
+                $this->original_item = $this->container;
                 if ($pos == 0) {
                     $number = 0;
                     $title = _('preview:: regroupement ');
@@ -128,6 +132,7 @@ class record_preview extends record_adapter
                     $children = $this->container->get_children();
                     foreach ($children as $child) {
                         $sbas_id = $child->get_sbas_id();
+                        $this->original_item = $child;
                         $record_id = $child->get_record_id();
                         if ($child->get_number() == $pos)
                             break;
@@ -153,6 +158,7 @@ class record_preview extends record_adapter
                     /* @var $element \Entities\BasketElement */
                     $i ++;
                     if ($first) {
+                        $this->original_item = $element;
                         $sbas_id = $element->getRecord($this->app)->get_sbas_id();
                         $record_id = $element->getRecord($this->app)->get_record_id();
                         $this->name = $Basket->getName();
@@ -161,6 +167,7 @@ class record_preview extends record_adapter
                     $first = false;
 
                     if ($element->getOrd() == $pos) {
+                        $this->original_item = $element;
                         $sbas_id = $element->getRecord($this->app)->get_sbas_id();
                         $record_id = $element->getRecord($this->app)->get_record_id();
                         $this->name = $Basket->getName();
@@ -181,6 +188,7 @@ class record_preview extends record_adapter
                     if ($first) {
                         $sbas_id = $element->get_record()->get_sbas_id();
                         $record_id = $element->get_record()->get_record_id();
+                        $this->original_item = $element;
                         $this->name = $entry->get_title();
                         $number = $element->get_ord();
                     }
@@ -189,6 +197,7 @@ class record_preview extends record_adapter
                     if ($element->get_ord() == $pos) {
                         $sbas_id = $element->get_record()->get_sbas_id();
                         $record_id = $element->get_record()->get_record_id();
+                        $this->original_item = $element;
                         $this->name = $entry->get_title();
                         $number = $element->get_ord();
                     }
@@ -258,6 +267,11 @@ class record_preview extends record_adapter
         return $this->env == 'REG';
     }
 
+    public function get_original_item()
+    {
+        return $this->original_item;
+    }
+
     /**
      *
      * @return String
@@ -638,4 +652,4 @@ class record_preview extends record_adapter
 
         return $this->download_popularity;
     }
-}
+}

templates/web/prod/WorkZone/Macros.html.twig

@@ -310,7 +310,7 @@
               href="{{ path('prod_stories_story_remove_element', { 'sbas_id' : container.get_sbas_id(), 'record_id' : container.get_record_id(), 'child_sbas_id' : record.get_sbas_id(), 'child_record_id' : record.get_record_id() }) }}"
             {% elseif wz_scope == 'basket' %}
               id="WZEL_{{ container.getId() }}_{{ record.get_sbas_id() }}_{{ record.get_record_id() }}"
-              href="{{ path('prod_baskets_basket_element_remove', { 'basket_id' : container.getId(), 'basket_element_id' : contained.getId()}) }}/"
+              href="{{ path('prod_baskets_basket_element_remove', { 'basket_id' : container.getId(), 'basket_element_id' : contained.getId()}) }}"
             {% elseif wz_scope == 'basket' %}
               href="#"
             {% endif %}

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,15 @@
        onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div>
 {% endif %}
 
+{% if record.is_from_basket() %}
+    <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' : record.get_original_item().getId()}) }}">
+    </a>
+{% 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

@@ -1,45 +1,37 @@
-(function(){
+(function() {
-  
+    $(document).ready(function() {
-  $(document).ready(function(){
+        humane.info = humane.spawn({addnCls: 'humane-libnotify-info', timeout: 1000});
-    
+        humane.error = humane.spawn({addnCls: 'humane-libnotify-error', timeout: 1000});
-    $('a.dialog').live('click', function(event){
 
-      var $this = $(this), size = 'Medium';
+        $('a.dialog').live('click', function(event) {
-      
+            var $this = $(this), size = 'Medium';
-      if($this.hasClass('small-dialog'))
-      {
-        size = 'Small';
-      }
-      else if($this.hasClass('full-dialog'))
-      {
-        size = 'Full';
-      }
-      
-      var options = {
-        size : size,
-        loading : true,
-        title : $this.attr('title'),
-        closeOnEscape : true
-      };
 
-      $dialog = p4.Dialog.Create(options);
+            if ($this.hasClass('small-dialog')) {
-      
+                size = 'Small';
-      $.ajax({
+            } else if ($this.hasClass('full-dialog')) {
-        type: "GET",
+                size = 'Full';
-        url: $this.attr('href'),
+            }
-        dataType: 'html',
-        beforeSend:function(){
 
-        },
+            var options = {
-        success: function(data){
+                size: size,
-          $dialog.setContent(data);
+                loading: true,
-          return;
+                title: $this.attr('title'),
-        }
+                closeOnEscape: true
-      });
+            };
 
-      return false;
+            $dialog = p4.Dialog.Create(options);
+
+            $.ajax({
+                type: "GET",
+                url: $this.attr('href'),
+                dataType: 'html',
+                success: function(data) {
+                    $dialog.setContent(data);
+                    return;
+                }
+            });
+
+            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) {