From f8b1849d07ef30094a419df71aa8d2a17f977137 Mon Sep 17 00:00:00 2001 From: Bryan Rumsey Date: Wed, 8 Sep 2021 15:29:46 -0400 Subject: [PATCH 1/2] Fixed issue with download and open links on presentation pages. --- client/pages/job-presentation.js | 6 +++--- client/pages/model-presentation.js | 4 ++-- client/pages/notebook-presentation.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/pages/job-presentation.js b/client/pages/job-presentation.js index ac698ec8f0..bbd7bf3173 100644 --- a/client/pages/job-presentation.js +++ b/client/pages/job-presentation.js @@ -61,9 +61,9 @@ let JobPresentationPage = PageView.extend({ self.renderSubviews(true); } }); - let downloadStart = "https://staging.stochss.org/stochss/job/download_presentation"; - this.downloadLink = downloadStart + "/" + owner + "/" + file; - this.openLink = "https://open.stochss.org?open=" + this.downloadLink; + let downloadStart = "/stochss/job/download_presentation"; + this.downloadLink = path.join(downloadStart, owner, file); + this.openLink = `https://open.stochss.org?open=${window.location.protocol}//${window.location.hostname}${this.downloadLink}`; }, render: function (attrs, options) { PageView.prototype.render.apply(this, arguments); diff --git a/client/pages/model-presentation.js b/client/pages/model-presentation.js index d7e77d9adf..41363048b6 100644 --- a/client/pages/model-presentation.js +++ b/client/pages/model-presentation.js @@ -60,9 +60,9 @@ let ModelPresentationPage = PageView.extend({ this.renderSubviews(true); } }); - let downloadStart = "https://live.stochss.org/stochss/download_presentation"; + let downloadStart = "/stochss/download_presentation"; this.downloadLink = path.join(downloadStart, owner, file); - this.openLink = "https://open.stochss.org?open=" + this.downloadLink; + this.openLink = `https://open.stochss.org?open=${window.location.protocol}//${window.location.hostname}${this.downloadLink}`; }, render: function (attrs, options) { PageView.prototype.render.apply(this, arguments); diff --git a/client/pages/notebook-presentation.js b/client/pages/notebook-presentation.js index 486ee06f0f..f7cf26774d 100644 --- a/client/pages/notebook-presentation.js +++ b/client/pages/notebook-presentation.js @@ -53,9 +53,9 @@ let NotebookPresentationPage = PageView.extend({ self.renderSubviews(true, null); } }); - let downloadStart = "https://live.stochss.org/stochss/notebook/download_presentation"; - this.downloadLink = downloadStart + "/" + owner + "/" + file; - this.openLink = "https://open.stochss.org?open=" + this.downloadLink; + let downloadStart = "/stochss/notebook/download_presentation"; + this.downloadLink = path.join(downloadStart, owner, file); + this.openLink = `https://open.stochss.org?open=${window.location.protocol}//${window.location.hostname}${this.downloadLink}`; }, render: function (attrs, options) { PageView.prototype.render.apply(this, arguments); From e7e7f3213608533d29210ffc105fa4d4158c5da7 Mon Sep 17 00:00:00 2001 From: Brian Drawert Date: Wed, 8 Sep 2021 13:26:20 -0700 Subject: [PATCH 2/2] v2.4.1 --- __version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__version__.py b/__version__.py index 124e6784c9..93d8b3f6da 100644 --- a/__version__.py +++ b/__version__.py @@ -5,7 +5,7 @@ # @website https://github.com/stochss/stochss # ============================================================================= -__version__ = '2.4' +__version__ = '2.4.1' __title__ = 'StochSS' __description__ = 'StochSS is an integrated development environment (IDE) \ for simulation of biochemical networks.'