Traitement de la réponse http lors d'un tri.

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index f4c449856f5d0633091527039f1f8982147de225..3c69aec19f9af7cf4beb1545cc8f76c360dd3566 100644 (file)
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -500,8 +500,10 @@ Lightbox.prototype.onDragEnd = function(evt) {
        if (this.lastDropTarget) {
                this.lastDropTarget.classList.remove('dragover');
                var i, slide;
        if (this.lastDropTarget) {
                this.lastDropTarget.classList.remove('dragover');
                var i, slide;

+               this.pendingMovedSlides = [];

                for(i=this.draggedSelection.length -1 ; i>=0 ; i--) {
                        slide = this.draggedSelection[i].cloneNode(true);
                for(i=this.draggedSelection.length -1 ; i>=0 ; i--) {
                        slide = this.draggedSelection[i].cloneNode(true);

+                       this.pendingMovedSlides.push(slide);

                        this.grid.insertBefore(slide, this.lastDropTarget.nextSibling);
                        slide.style.opacity = 1;
                        slide.style.width = '';
                        this.grid.insertBefore(slide, this.lastDropTarget.nextSibling);
                        slide.style.opacity = 1;
                        slide.style.width = '';


@@ -522,10 +524,7 @@ Lightbox.prototype.moveSelectedPhotos = function() {
                                break;
                        case 4 :
                                hideProgressImage();
                                break;
                        case 4 :
                                hideProgressImage();

-                               if (req.status === 200) {
-                                       console.log(req.responseText);
-                                       // self._refreshGrid(req);
-                               }
+                               self._moveSelectedPhotos(req)

                                break;
                }
        };
                                break;
                }
        };


@@ -542,7 +541,31 @@ Lightbox.prototype.moveSelectedPhotos = function() {
        req.send(query);
 };
 
        req.send(query);
 };
 

-Lightbox.prototype.moveSelectedPhoto = function() {
+Lightbox.prototype._moveSelectedPhotos = function(req) {
+       var i, slide;
+       if (req.status === 200) {
+               var doc = req.responseXML.documentElement;
+               if (doc.nodeName === 'ok') {
+                       this.pendingMovedSlides = undefined;
+                       for(i=0 ; i<this.draggedSelection.length ; i++) {
+                               slide = this.draggedSelection[i];
+                               this.grid.removeChild(slide);
+                       }
+                       this.cbIndex = undefined;
+                       return;
+               }
+       }
+       
+       for(i=0 ; i<this.pendingMovedSlides.length ; i++) {
+               slide = this.pendingMovedSlides[i];
+               this.grid.removeChild(slide);
+       }
+       
+       for(i=0 ; i<this.draggedSelection.length ; i++) {
+               slide = this.draggedSelection[i];
+               slide.style.opacity = 1;
+               slide.style.width = '';
+       }

 };
 
 }());
\ No newline at end of file
 };
 
 }());
\ No newline at end of file

diff --git a/skins/portfolio_move_photos.py b/skins/portfolio_move_photos.py
index 99c8ba1d1e20e913cd34be81afe489ce752ea378..afee01da47bca8662e92feed3a7f65faaa2e309b 100644 (file)
--- a/skins/portfolio_move_photos.py
+++ b/skins/portfolio_move_photos.py
@@ -11,7 +11,12 @@ if container_type == 'portfolio' :
     dropId = uidh.getBrain(int(fg('afterUid'))).getId
     uids = fg('uids', [])
     ids = [uidh.getBrain(uid).getId for uid in uids]
     dropId = uidh.getBrain(int(fg('afterUid'))).getId
     uids = fg('uids', [])
     ids = [uidh.getBrain(uid).getId for uid in uids]

-    context.moveObjectsAfter(ids, dropId)
+    context.REQUEST.RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8')
+    try :
+        context.moveObjectsAfter(ids, dropId)
+        return '<ok/>'
+    except NotImplementedError :
+        raise

 
 return printed
 
 
 return printed