From 8da601bafdc29f5a36f1b778c6eb102055e43343 Mon Sep 17 00:00:00 2001 From: Binal Date: Mon, 6 Jul 2020 16:04:25 -0700 Subject: [PATCH 1/2] Merge from wnprc18.3 svn r.65197 to 65647 (skipping r.65166 since its a backport) --- .../org/labkey/flow/controllers/WorkspaceData.java | 14 +++++++++++++- .../executescript/AnalysisScriptController.java | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/flow/src/org/labkey/flow/controllers/WorkspaceData.java b/flow/src/org/labkey/flow/controllers/WorkspaceData.java index bd2f825cc3..2d341421f3 100644 --- a/flow/src/org/labkey/flow/controllers/WorkspaceData.java +++ b/flow/src/org/labkey/flow/controllers/WorkspaceData.java @@ -28,6 +28,9 @@ import org.labkey.api.view.HttpView; import org.labkey.api.view.ViewContext; import org.labkey.flow.analysis.model.Analysis; +import org.labkey.api.util.SessionHelper; +import org.labkey.api.view.HttpView; +import org.labkey.api.view.ViewContext; import org.labkey.flow.analysis.model.FlowException; import org.labkey.flow.analysis.model.ISampleInfo; import org.labkey.flow.analysis.model.IWorkspace; @@ -56,6 +59,7 @@ import java.util.concurrent.TimeUnit; import static org.labkey.api.action.SpringActionController.ERROR_MSG; +import java.util.concurrent.TimeUnit; public class WorkspaceData implements Serializable { @@ -86,6 +90,7 @@ public String getPath() public void setOriginalPath(String path) { + Map ret = new HashMap<>(); if (path != null) { path = PageFlowUtil.decode(path); @@ -128,6 +133,12 @@ public void clearStashedWorkspace(HttpServletRequest request) SessionHelper.clearStashedAttribute(request, token); } + public void clearStashedWorkspace(HttpServletRequest request) + { + if (token != null) + SessionHelper.clearStashedAttribute(request, token); + } + public IWorkspace getWorkspaceObject() { return _object; @@ -350,7 +361,8 @@ private void addCaseSensitiveWarnings(Errors errors, List messages, bool for (String msg : messages) errors.reject(ERROR_MSG, msg); } - else + + if (_object != null && token == null) { _object.getWarnings().addAll(messages); } diff --git a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java index 9df06acaa7..1257b4d567 100644 --- a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java +++ b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java @@ -40,6 +40,7 @@ import org.labkey.api.assay.AssayFileWriter; import org.labkey.api.util.PageFlowUtil; import org.labkey.api.util.Pair; +import org.labkey.api.util.SessionHelper; import org.labkey.api.util.URIUtil; import org.labkey.api.util.URLHelper; import org.labkey.api.view.ActionURL; From d1581adb6904ad86a564550602a908cc6f90fd50 Mon Sep 17 00:00:00 2001 From: Binal Date: Mon, 6 Jul 2020 16:30:55 -0700 Subject: [PATCH 2/2] Remove duplicates happened during merge. --- flow/src/org/labkey/flow/controllers/WorkspaceData.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/flow/src/org/labkey/flow/controllers/WorkspaceData.java b/flow/src/org/labkey/flow/controllers/WorkspaceData.java index 2d341421f3..bf2be0da1d 100644 --- a/flow/src/org/labkey/flow/controllers/WorkspaceData.java +++ b/flow/src/org/labkey/flow/controllers/WorkspaceData.java @@ -133,12 +133,6 @@ public void clearStashedWorkspace(HttpServletRequest request) SessionHelper.clearStashedAttribute(request, token); } - public void clearStashedWorkspace(HttpServletRequest request) - { - if (token != null) - SessionHelper.clearStashedAttribute(request, token); - } - public IWorkspace getWorkspaceObject() { return _object;