Skip to content

Complete migration from srcURL and returnURL to returnUrl #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Mar 5, 2025
Merged

Complete migration from srcURL and returnURL to returnUrl #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SequenceAnalysis/resources/views/readsetDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}]
}]
}
Expand Down
4 changes: 2 additions & 2 deletions SequenceAnalysis/resources/views/sequenceAnalysisDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}]
}]
}
Expand Down Expand Up @@ -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()
}]
}]
}
Expand Down
2 changes: 1 addition & 1 deletion SequenceAnalysis/resources/web/SequenceAnalysis/panel/IlluminaSampleExportPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SequenceAnalysis/resources/web/SequenceAnalysis/sequenceanalysisButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ SequenceAnalysis.Buttons = new function(){
pks: checked,
schemaName: 'sequenceanalysis',
queryName: 'sequence_readsets',
srcURL: LDK.Utils.getSrcURL()
returnUrl: LDK.Utils.getReturnUrl()
})
},

Expand Down
2 changes: 1 addition & 1 deletion SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Expand Down