Skip to content

Merge from wnprc18.3 svn r.64261 to r.65647#200

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

Closed
labkey-bpatel wants to merge 2 commits into from
Closed

Merge from wnprc18.3 svn r.64261 to r.65647 #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8da601b
Merge from wnprc18.3 svn r.65197 to 65647 (skipping r.65166 since its…
labkey-bpatel Jul 6, 2020
d1581ad
Remove duplicates happened during merge.
labkey-bpatel Jul 6, 2020
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
8 changes: 7 additions & 1 deletion flow/src/org/labkey/flow/controllers/WorkspaceData.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand DownExpand Up@@ -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
{
Expand DownExpand Up@@ -86,6 +90,7 @@ public String getPath()

public void setOriginalPath(String path)
{
Map<String, String> ret = new HashMap<>();
if (path != null)
{
path = PageFlowUtil.decode(path);
Expand DownExpand Up@@ -350,7 +355,8 @@ private void addCaseSensitiveWarnings(Errors errors, List<String> messages, bool
for (String msg : messages)
errors.reject(ERROR_MSG, msg);
}
else

if (_object != null && token == null)
{
_object.getWarnings().addAll(messages);
}
Expand Down
1 change: 1 addition & 0 deletions flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand Down