From 6615b722d5262f70ff7485fbd0068143ca722ae3 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Mon, 3 Mar 2025 17:28:54 -0800 Subject: [PATCH] Complete migration from srcURL and returnURL to returnUrl --- ehr/resources/web/ehr/DataEntryUtils.js | 18 ++++++++---------- .../web/ehr/panel/BulkEditDataEntryPanel.js | 2 +- .../web/ehr/panel/LockAnimalsPanel.js | 6 +++--- .../web/ehr/window/CreateProjectWindow.js | 2 +- .../web/ehr/window/OpenSurgeryCasesWindow.js | 2 +- .../web/ehr/window/SubmitForReviewWindow.js | 4 ++-- .../ehr_billing/EHR_BillingController.java | 2 +- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/ehr/resources/web/ehr/DataEntryUtils.js b/ehr/resources/web/ehr/DataEntryUtils.js index 99ff5eea7..fde22bc77 100644 --- a/ehr/resources/web/ehr/DataEntryUtils.js +++ b/ehr/resources/web/ehr/DataEntryUtils.js @@ -176,7 +176,7 @@ EHR.DataEntryUtils = new function(){ BASICSUBMIT: { text: 'Submit', name: 'submit', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('project', 'start'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('project', 'start'), disabled: false, itemId: 'submitBasicBtn', handler: function(btn){ @@ -202,7 +202,7 @@ EHR.DataEntryUtils = new function(){ requiredQC: 'Completed', targetQC: 'Completed', errorThreshold: 'INFO', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'submitBtn', handler: function(btn){ @@ -242,7 +242,7 @@ EHR.DataEntryUtils = new function(){ targetQC: 'Completed', requiredPermission: 'admin', errorThreshold: 'ERROR', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'forceSubmitBtn', handler: function(btn){ @@ -263,7 +263,7 @@ EHR.DataEntryUtils = new function(){ requiredQC: 'Scheduled', targetQC: 'Scheduled', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'scheduledBtn', disableOn: 'ERROR', @@ -294,7 +294,7 @@ EHR.DataEntryUtils = new function(){ itemId: 'discardBtn', targetQC: 'Delete Requested', requiredQC: 'Delete Requested', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), handler: function(btn){ var panel = btn.up('ehr-dataentrypanel'); panel.discard({ @@ -310,7 +310,7 @@ EHR.DataEntryUtils = new function(){ name: 'closeBtn', requiredQC: 'In Progress', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'closeBtn', handler: function(btn){ @@ -429,8 +429,7 @@ EHR.DataEntryUtils = new function(){ targetQC: 'Request: Pending', requiredQC: 'Request: Pending', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') - || (LABKEY.ActionURL.buildURL('ehr', 'serviceRequests.view') + '#tab=myPendingRequests'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || (LABKEY.ActionURL.buildURL('ehr', 'serviceRequests.view') + '#tab=myPendingRequests'), disabled: true, itemId: 'requestBtn', handler: function(btn){ @@ -448,8 +447,7 @@ EHR.DataEntryUtils = new function(){ targetQC: 'Request: Approved', requiredQC: 'Request: Approved', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') - || (LABKEY.ActionURL.buildURL('ehr', 'serviceRequests.view') + '#tab=queues'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || (LABKEY.ActionURL.buildURL('ehr', 'serviceRequests.view') + '#tab=queues'), disabled: true, itemId: 'approveBtn', handler: function(btn){ diff --git a/ehr/resources/web/ehr/panel/BulkEditDataEntryPanel.js b/ehr/resources/web/ehr/panel/BulkEditDataEntryPanel.js index 4bd2e5291..a4148a13b 100644 --- a/ehr/resources/web/ehr/panel/BulkEditDataEntryPanel.js +++ b/ehr/resources/web/ehr/panel/BulkEditDataEntryPanel.js @@ -32,7 +32,7 @@ Ext4.define('EHR.panel.BulkEditDataEntryPanel', { if(extraContext && extraContext.successURL){ window.onbeforeunload = Ext4.emptyFn; - window.location = LABKEY.ActionURL.getParameter('srcURL') || extraContext.successURL; + window.location = LABKEY.ActionURL.getParameter('returnUrl') || extraContext.successURL; } else { this.updateDirtyStateMessage(); diff --git a/ehr/resources/web/ehr/panel/LockAnimalsPanel.js b/ehr/resources/web/ehr/panel/LockAnimalsPanel.js index 19847183c..fdd1284f5 100644 --- a/ehr/resources/web/ehr/panel/LockAnimalsPanel.js +++ b/ehr/resources/web/ehr/panel/LockAnimalsPanel.js @@ -183,7 +183,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('BIRTHARRIVALCLOSE', { name: 'closeBtn', requiredQC: 'In Progress', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'closeBtn1', handler: function(btn){ @@ -209,7 +209,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('BIRTHARRIVALFINAL', { requiredQC: 'Completed', targetQC: 'Completed', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'submitBtn', handler: function(btn){ @@ -268,7 +268,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('BIRTHARRIVALREVIEW', { requiredQC: 'Review Required', targetQC: 'Review Required', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'reviewBtn1', handler: function(btn){ diff --git a/ehr/resources/web/ehr/window/CreateProjectWindow.js b/ehr/resources/web/ehr/window/CreateProjectWindow.js index b4b6bec92..7d6a7b97a 100644 --- a/ehr/resources/web/ehr/window/CreateProjectWindow.js +++ b/ehr/resources/web/ehr/window/CreateProjectWindow.js @@ -76,7 +76,7 @@ Ext4.define('EHR.window.CreateProjectWindow', { }; var newForm = Ext4.DomHelper.append(document.getElementsByTagName('body')[0], - '
' + + '' + '' + '' + '
'); diff --git a/ehr/resources/web/ehr/window/OpenSurgeryCasesWindow.js b/ehr/resources/web/ehr/window/OpenSurgeryCasesWindow.js index 6a9415c94..eafed3a78 100644 --- a/ehr/resources/web/ehr/window/OpenSurgeryCasesWindow.js +++ b/ehr/resources/web/ehr/window/OpenSurgeryCasesWindow.js @@ -316,7 +316,7 @@ Ext4.define('EHR.window.OpenSurgeryCasesWindow', { EHR.DataEntryUtils.registerDataEntryFormButton('OPENSURGERYCASES', { text: 'Open Cases', name: 'openSurgeryCase', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'openSurgeryCases', requiredPermissions: [ diff --git a/ehr/resources/web/ehr/window/SubmitForReviewWindow.js b/ehr/resources/web/ehr/window/SubmitForReviewWindow.js index ab82e7206..4ce929fca 100644 --- a/ehr/resources/web/ehr/window/SubmitForReviewWindow.js +++ b/ehr/resources/web/ehr/window/SubmitForReviewWindow.js @@ -89,7 +89,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('REVIEW', { requiredQC: 'Review Required', targetQC: 'Review Required', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'reviewBtn', disableOn: 'ERROR', @@ -113,7 +113,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('VET_REVIEW', { requiredQC: 'Review Required', targetQC: 'Review Required', errorThreshold: 'WARN', - successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), + successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'), disabled: true, itemId: 'reviewBtn', disableOn: 'ERROR', diff --git a/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingController.java b/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingController.java index 509bd3637..a16262e5c 100644 --- a/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingController.java +++ b/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingController.java @@ -169,7 +169,7 @@ public boolean handlePost(QueryForm form, BindException errors) throws BatchVali @Override public @NotNull URLHelper getSuccessURL(QueryForm form) { - URLHelper url = form.getReturnURLHelper(); + URLHelper url = form.getReturnUrlHelper(); return url != null ? url : QueryService.get().urlFor(getUser(), getContainer(), QueryAction.executeQuery, EHR_BillingSchema.NAME, EHR_BillingSchema.TABLE_INVOICE_RUNS); } }