Merge remote-tracking branch 'upstream/master'

justb4 · Feb 3, 2014 · 1cb15bb · 1cb15bb
2 parents 9369cbf + 3dda12b
commit 1cb15bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/script/plugins/Legend.js b/src/script/plugins/Legend.js
@@ -74,7 +74,7 @@ gxp.plugins.Legend = Ext.extend(gxp.plugins.Tool, {
             tooltip: this.tooltip,
             handler: function() {
                 this.removeOutput();
-                this.addOutput();
+                this.addOutput(this.outputConfig);
             },
             scope: this
         }];

diff --git a/src/script/plugins/WMSSource.js b/src/script/plugins/WMSSource.js
@@ -217,7 +217,11 @@ gxp.plugins.WMSSource = Ext.extend(gxp.plugins.LayerSource, {
      */
     onAuthorizationChange: function() {
         if (this.store && this.url.charAt(0) === "/") {
-            this.store.reload();
+            var lastOptions = this.store.lastOptions || {params: {}};
+            Ext.apply(lastOptions.params, {
+                '_dc': Math.random()
+            });
+            this.store.reload(lastOptions);
         }
     },