Complete migration from srcURL and returnURL to returnUrl (#340)

Author: labkey-jeckels

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()
                 }]
             }]
         }

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()
                         }]
                     }]
                 }

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

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()
             })
         },
 

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());
         }
     }