From b14d3fe5f8f03cafc18c940d0bc3aa7d7c60430b Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Mon, 3 Mar 2025 17:28:11 -0800 Subject: [PATCH] Complete migration from srcURL and returnURL to returnUrl --- SequenceAnalysis/resources/views/readsetDetails.html | 2 +- SequenceAnalysis/resources/views/sequenceAnalysisDetails.html | 4 ++-- .../web/SequenceAnalysis/panel/IlluminaSampleExportPanel.js | 2 +- .../resources/web/SequenceAnalysis/sequenceanalysisButtons.js | 2 +- .../labkey/sequenceanalysis/SequenceAnalysisController.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SequenceAnalysis/resources/views/readsetDetails.html b/SequenceAnalysis/resources/views/readsetDetails.html index 411d993ba..c3110d8c4 100644 --- a/SequenceAnalysis/resources/views/readsetDetails.html +++ b/SequenceAnalysis/resources/views/readsetDetails.html @@ -37,7 +37,7 @@ text: 'More Actions', menu: [{ text: 'Edit Details', - href: LABKEY.ActionURL.buildURL('ldk', 'manageRecord', null, {schemaName: 'sequenceanalysis', queryName: 'sequence_readsets', keyField: 'rowid', key: readsetId}) + '&returnUrl=' + LDK.Utils.getSrcURL() + href: LABKEY.ActionURL.buildURL('ldk', 'manageRecord', null, {schemaName: 'sequenceanalysis', queryName: 'sequence_readsets', keyField: 'rowid', key: readsetId}) + '&returnUrl=' + LDK.Utils.getReturnUrl() }] }] } diff --git a/SequenceAnalysis/resources/views/sequenceAnalysisDetails.html b/SequenceAnalysis/resources/views/sequenceAnalysisDetails.html index dcc9f9102..9ae06ca82 100644 --- a/SequenceAnalysis/resources/views/sequenceAnalysisDetails.html +++ b/SequenceAnalysis/resources/views/sequenceAnalysisDetails.html @@ -38,7 +38,7 @@ text: 'More Actions', menu: [{ text: 'Edit Analysis Details', - href: LABKEY.ActionURL.buildURL('ldk', 'manageRecord', null, {schemaName: 'sequenceanalysis', queryName: 'sequence_analyses', keyField: 'rowid', key: analysisId}) + '&returnUrl=' + LDK.Utils.getSrcURL() + href: LABKEY.ActionURL.buildURL('ldk', 'manageRecord', null, {schemaName: 'sequenceanalysis', queryName: 'sequence_analyses', keyField: 'rowid', key: analysisId}) + '&returnUrl=' + LDK.Utils.getReturnUrl() }] }] } @@ -94,7 +94,7 @@ text: 'More Actions', menu: [{ text: 'Edit Readset Details', - href: LABKEY.ActionURL.buildURL('ldk', 'manageRecord', null, {schemaName: 'sequenceanalysis', queryName: 'sequence_readsets', keyField: 'rowid', key: row.readset}) + '&returnUrl=' + LDK.Utils.getSrcURL() + href: LABKEY.ActionURL.buildURL('ldk', 'manageRecord', null, {schemaName: 'sequenceanalysis', queryName: 'sequence_readsets', keyField: 'rowid', key: row.readset}) + '&returnUrl=' + LDK.Utils.getReturnUrl() }] }] } diff --git a/SequenceAnalysis/resources/web/SequenceAnalysis/panel/IlluminaSampleExportPanel.js b/SequenceAnalysis/resources/web/SequenceAnalysis/panel/IlluminaSampleExportPanel.js index a41ea8123..5b88890fa 100644 --- a/SequenceAnalysis/resources/web/SequenceAnalysis/panel/IlluminaSampleExportPanel.js +++ b/SequenceAnalysis/resources/web/SequenceAnalysis/panel/IlluminaSampleExportPanel.js @@ -226,7 +226,7 @@ Ext4.define('SequenceAnalysis.panel.IlluminaSampleExportPanel', { },{ text: 'Cancel', handler: function(btn){ - var url = LABKEY.ActionURL.getParameter('srcURL'); + var url = LABKEY.ActionURL.getParameter('returnUrl'); if (url) window.location = decodeURIComponent(url); else diff --git a/SequenceAnalysis/resources/web/SequenceAnalysis/sequenceanalysisButtons.js b/SequenceAnalysis/resources/web/SequenceAnalysis/sequenceanalysisButtons.js index 802fd4fca..e2cd084f9 100644 --- a/SequenceAnalysis/resources/web/SequenceAnalysis/sequenceanalysisButtons.js +++ b/SequenceAnalysis/resources/web/SequenceAnalysis/sequenceanalysisButtons.js @@ -286,7 +286,7 @@ SequenceAnalysis.Buttons = new function(){ pks: checked, schemaName: 'sequenceanalysis', queryName: 'sequence_readsets', - srcURL: LDK.Utils.getSrcURL() + returnUrl: LDK.Utils.getReturnUrl() }) }, diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java index e414823a3..82dc613b8 100644 --- a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java +++ b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java @@ -924,7 +924,7 @@ else if (SequenceAnalysisSchema.TABLE_OUTPUTFILES.equals(_table.getName())) @Override public @NotNull URLHelper getSuccessURL(DeleteForm form) { - URLHelper url = form.getReturnURLHelper(); + URLHelper url = form.getReturnUrlHelper(); return url != null ? url : _table.getGridURL(getContainer()) != null ? _table.getGridURL(getContainer()) : getContainer().getStartURL(getUser()); } }