Auto-open / don't auto-close uploader if there were errors during tra…

…nsfer
pydio · Sep 27, 2016 · dc0022a · dc0022a
1 parent 228560a
commit dc0022a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/core/src/plugins/uploader.html/js/react/UploaderModel.js b/core/src/plugins/uploader.html/js/react/UploaderModel.js
@@ -396,8 +396,12 @@
                 }.bind(this));
             }else{
                 UploadTask.getInstance().setIdle();
-                if(this.getAutoClose() && pydio.Controller.react_selector){
-                    pydio.UI.modal.dismiss();
+                if(this.hasErrors()){
+                    if(!pydio.getController().react_selector){
+                        global.pydio.getController().fireAction("upload");
+                    }
+                }else if(this.getAutoClose()){
+                    this.notify("auto_close");
                 }
             }
         }
@@ -426,6 +430,15 @@
                 processed: this._processed
             };
         }
+        hasErrors(){
+            let result = false;
+            this._processed.map(function(item){
+                if(item.getStatus() === 'error'){
+                    result = true;
+                }
+            });
+            return result;
+        }
         static getInstance(){
             if(!UploaderStore.__INSTANCE){
                 UploaderStore.__INSTANCE = new UploaderStore();

diff --git a/core/src/plugins/uploader.html/js/react/UploaderView.js b/core/src/plugins/uploader.html/js/react/UploaderView.js
@@ -182,12 +182,16 @@
                 this.setState({items: store.getItems()});
             }.bind(this);
             store.observe("update", this._storeObserver);
+            store.observe("auto_close", function(){
+                pydio.UI.modal.dismiss();
+            });
             this.setState({items: store.getItems()});
         },
 
         componentWillUnmount: function(){
             if(this._storeObserver){
                 UploaderModel.Store.getInstance().stopObserving("update", this._storeObserver);
+                UploaderModel.Store.getInstance().stopObserving("auto_close");
             }
         },