Skip to content

Complete migration from srcURL and returnURL to returnUrl #762

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 #762

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 WNPRC_EHR/resources/views/dataEntry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
var makeExt4DataEntryURL = function(formName, params) {
params = params || {};
params.formType = formName;
params.returnURL = LABKEY.ActionURL.buildURL("wnprc_ehr", "dataEntry");
params.returnUrl = LABKEY.ActionURL.buildURL("wnprc_ehr", "dataEntry");

return makeURL("dataEntryForm", params);
};
Expand Down
34 changes: 17 additions & 17 deletions WNPRC_EHR/resources/web/ehr/ext3/ehrImportPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ Ext.extend(EHR.ext.ImportPanel.Base, Ext.Panel, {
var extraContext = {
targetQC : o.targetQC,
errorThreshold: o.errorThreshold,
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
importPathway: 'ehr-ext3DataEntry'
};

Expand Down Expand Up @@ -802,7 +802,7 @@ EHR.ext.ImportPanel.Buttons = {
//targetQC: 'In Progress',
requiredQC: 'In Progress',
errorThreshold: 'WARN',
//successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
//successURL: LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'saveDraftBtn',
handler: this.onSubmit,
Expand All @@ -820,7 +820,7 @@ EHR.ext.ImportPanel.Buttons = {
requiredPermission: 'admin',
targetQC: 'Completed',
errorThreshold: 'INFO',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'submitBtn',
handler: function(o){
Expand All @@ -842,7 +842,7 @@ EHR.ext.ImportPanel.Buttons = {
requiredQC: 'Completed',
targetQC: 'Completed',
errorThreshold: 'INFO',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'submitBtn',
handler: function(o){
Expand All @@ -864,7 +864,7 @@ EHR.ext.ImportPanel.Buttons = {
requiredQC: 'Completed',
targetQC: 'Completed',
errorThreshold: 'INFO',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'submitBtn',
handler: function(o){
Expand All @@ -887,7 +887,7 @@ EHR.ext.ImportPanel.Buttons = {
targetQC: 'Completed',
requiredPermission: 'admin',
errorThreshold: 'ERROR',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'foreceSubmitBtn',
handler: function(o){
Expand Down Expand Up @@ -930,7 +930,7 @@ EHR.ext.ImportPanel.Buttons = {
requiredQC: 'Completed',
targetQC: 'Completed',
errorThreshold: 'INFO',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'submitBtn',
handler: function(o){
Expand Down Expand Up @@ -980,7 +980,7 @@ EHR.ext.ImportPanel.Buttons = {
targetQC: 'Request: Pending',
requiredQC: 'Request: Pending',
errorThreshold: 'ERROR',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "requestServices.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "requestServices.view"),
disabled: true,
ref: 'requestBtn',
handler: function(o){
Expand Down Expand Up @@ -1032,7 +1032,7 @@ EHR.ext.ImportPanel.Buttons = {
requiredQC: 'Completed',
//targetQC: 'Completed',
errorThreshold: 'INFO',
//successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
//successURL: LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'finalizeDeathBtn',
handler: function(o){
Expand Down Expand Up @@ -1235,7 +1235,7 @@ EHR.ext.ImportPanel.Buttons = {
name: 'basicsubmit',
requiredQC: 'Completed',
errorThreshold: 'INFO',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'submitBtn',
handler: function(o){
Expand Down Expand Up @@ -1275,7 +1275,7 @@ EHR.ext.ImportPanel.Buttons = {
requiredQC: 'Review Required',
targetQC: 'Review Required',
errorThreshold: 'WARN',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'reviewBtn',
disableOn: 'ERROR',
Expand Down Expand Up @@ -1356,7 +1356,7 @@ EHR.ext.ImportPanel.Buttons = {
requiredQC: 'Scheduled',
targetQC: 'Scheduled',
errorThreshold: 'WARN',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'scheduledBtn',
disableOn: 'ERROR',
Expand Down Expand Up @@ -1389,7 +1389,7 @@ EHR.ext.ImportPanel.Buttons = {
ref: 'discardBtn',
targetQC: 'Delete Requested',
requiredQC: 'Delete Requested',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
handler: this.requestDelete,
//handler: this.onSubmit,
scope: this
Expand All @@ -1404,7 +1404,7 @@ EHR.ext.ImportPanel.Buttons = {
ref: 'deleteBtn',
targetQC: 'Delete Requested',
requiredQC: 'Delete Requested',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
handler: this.requestDelete,
//handler: this.onSubmit,
scope: this
Expand All @@ -1419,7 +1419,7 @@ EHR.ext.ImportPanel.Buttons = {
//targetQC: 'In Progress',
requiredQC: 'In Progress',
errorThreshold: 'WARN',
successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'closeBtn',
handler: this.onSubmit,
Expand Down Expand Up @@ -1460,7 +1460,7 @@ EHR.ext.ImportPanel.Buttons = {
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", "requestServices.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "requestServices.view"),
disabled: true,
ref: 'requestBtn',
handler: this.onSubmit,
Expand All @@ -1477,7 +1477,7 @@ EHR.ext.ImportPanel.Buttons = {
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", "dataEntry.view"),
successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
disabled: true,
ref: 'approveBtn',
handler: this.onSubmit,
Expand Down
4 changes: 2 additions & 2 deletions WNPRC_EHR/resources/web/wnprc_ehr/ext4/components/buttons/husbandryButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('FOOD_STARTED', {
requiredQC: 'Scheduled',
targetQC: 'Started',
errorThreshold: 'WARN',
successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('wnprc_ehr', 'dataEntry.view'),
successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('wnprc_ehr', 'dataEntry.view'),
disabled: true,
itemId: 'depriveBtn',
disableOn: 'ERROR',
Expand Down Expand Up @@ -259,7 +259,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('SUBMIT_WATER', {
requiredQC: 'Completed',
targetQC: 'Completed',
errorThreshold: 'WARN',
successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('wnprc_ehr', 'dataEntry.view'),
successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('wnprc_ehr', 'dataEntry.view'),
disabled: true,
itemId: 'submitWtrBtn',
disableOn: 'WARN',
Expand Down
2 changes: 1 addition & 1 deletion WNPRC_EHR/resources/web/wnprc_ehr/ext4/utils/DataEntryButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
(function() {
var getReturnURL = function() {
return LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('project', 'start');
return LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('project', 'start');
};

var registerBtn = function(name, config) {
Expand Down
12 changes: 6 additions & 6 deletions WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/NotificationToolkit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,10 +915,10 @@ else if (currentClause instanceof SimpleFilter.InClause) {
}

//Creates URL to return.
Path returnURL = new Path(new ActionURL().getBaseServerURI(), queryURL.toString());
Path returnUrl = new Path(new ActionURL().getBaseServerURI(), queryURL.toString());

//Returns URL.
return returnURL.toString();
return returnUrl.toString();
}

public String createFormURL(Container c, String formType, String taskID) {
Expand All @@ -929,10 +929,10 @@ public String createFormURL(Container c, String formType, String taskID) {
formURL.addParameter("taskid", taskID);

// Creates path.
Path returnURL = new Path(new ActionURL().getBaseServerURI(), formURL.toString());
Path returnUrl = new Path(new ActionURL().getBaseServerURI(), formURL.toString());

// Returns URL.
return returnURL.toString();
return returnUrl.toString();
}

public String createAnimalHistoryURL(Container c, String subject) {
Expand All @@ -947,10 +947,10 @@ public String createAnimalHistoryURL(Container c, String subject) {
// animalHistoryURL.addParameter("activeReport", "abstract");

// Creates path.
Path returnURL = new Path(new ActionURL().getBaseServerURI(), animalHistoryURLWithID);
Path returnUrl = new Path(new ActionURL().getBaseServerURI(), animalHistoryURLWithID);

// Returns URL.
return returnURL.toString();
return returnUrl.toString();
}

// TODO: COMMENT!!!
Expand Down