Upload Configs : make sure options are reloaded on repository switch

pydio · Sep 29, 2016 · fada3e7 · fada3e7
1 parent 3e8328d
commit fada3e7
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/core/src/plugins/uploader.html/js/react/UploaderModel.js b/core/src/plugins/uploader.html/js/react/UploaderModel.js
@@ -553,9 +553,17 @@
 
         constructor(){
             super();
-            this._global = global.pydio.getPluginConfigs("uploader");
-            this._mq = global.pydio.getPluginConfigs("mq");
-            this._user = global.pydio.user.preferences;
+            pydio.observe("registry_loaded", function(){
+                this._global = null;
+                this._mq = null;
+            }.bind(this));
+        }
+
+        _loadOptions(){
+            if(!this._global){
+                this._global = global.pydio.getPluginConfigs("uploader");
+                this._mq = global.pydio.getPluginConfigs("mq");
+            }
         }
 
         getOptionAsBool(name, userPref = '', defaultValue = undefined){
@@ -564,6 +572,7 @@
         }
 
         getOption(name, userPref = '', defaultValue = undefined){
+            this._loadOptions();
             if(userPref){
                 let test = this.getUserPreference('originalUploadForm_XHRUploader', userPref);
                 if(test !== undefined && test !== null) return test;