Prechádzať zdrojové kódy

Merge pull request #11622 from GordonSmith/HPCC-20430

HPCC-20430 Open in new window should include nopack=1

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 6 rokov pred
rodič
commit
c7fa3777be
1 zmenil súbory, kde vykonal 5 pridanie a 2 odobranie
  1. 5 2
      esp/src/eclwatch/_Widget.js

+ 5 - 2
esp/src/eclwatch/_Widget.js

@@ -129,14 +129,17 @@ define([
 
 
             getURL: function () {
             getURL: function () {
                 var baseUrl = document.URL.split("#")[0];
                 var baseUrl = document.URL.split("#")[0];
-                baseUrl = baseUrl.split("?")[0];
+                var baseUrlParts = baseUrl.split("?");
+                baseUrl = baseUrlParts[0];
+                var args = baseUrlParts[1];
+                var nopack = (args && args.indexOf("nopack=1") >= 0) ? "nopack=1&" : "";
                 delete this.params.__filter;
                 delete this.params.__filter;
                 var filterParams = this.getFilterParams();
                 var filterParams = this.getFilterParams();
                 if (filterParams) {
                 if (filterParams) {
                     this.params.__filter = ioQuery.objectToQuery(filterParams);
                     this.params.__filter = ioQuery.objectToQuery(filterParams);
                 }
                 }
                 var paramsString = ioQuery.objectToQuery(this.params);
                 var paramsString = ioQuery.objectToQuery(this.params);
-                return baseUrl + "?" + paramsString;
+                return baseUrl + "?" + nopack + paramsString;
             },
             },
 
 
             _onNewPage: function (event) {
             _onNewPage: function (event) {