Skip to content
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

Jump to bottom

Issue 50861: Pass around properly encoded WebDav URLs #816

Merged
merged 4 commits into from
Nov 5, 2024
Merged

Issue 50861: Pass around properly encoded WebDav URLs #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f03615
Issue 50861: Pass around properly encoded WebDav URLs
labkey-jeckels Oct 18, 2024
fd1a3f5
Avoid NPE when NAb assay design has gotten detached from its plate te…
labkey-jeckels Oct 21, 2024
8b51aa5
Merge origin/develop into fb_50861_webdavUrlEncoding
labkey-tchad Oct 24, 2024
b31a1b8
Merge origin/develop into fb_50861_webdavUrlEncoding
labkey-tchad Oct 28, 2024
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
4 changes: 2 additions & 2 deletions flow/src/org/labkey/flow/controllers/executescript/importAnalysisSelectFCSFiles.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

IWorkspace workspace = form.getWorkspace().getWorkspaceObject();
List<String> warnings = workspace.getWarnings();
if (warnings.size() > 0)
if (!warnings.isEmpty())
{
%>
<p class="labkey-warning-messages" style="display:inline-block">
Expand Down Expand Up @@ -166,7 +166,7 @@
Ext4.QuickTips.init();

fileSystem = Ext4.create('File.system.Webdav', {
rootPath : <%=q(pipeRoot.getWebdavURL())%>,
rootPath : <%=q(pipeRoot.getWebdavURL().toString())%>,
rootName : <%=q(AppProps.getInstance().getServerName())%>
//rootOffset : <%=q(keywordDir)%>
});
Expand Down
4 changes: 2 additions & 2 deletions nab/src/org/labkey/nab/NabAssayProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,9 @@ public PlateSamplePropertyHelper getVirusPropertyHelper(PlateUploadForm context,
try
{
AssayProvider provider = context.getProvider();
if (supportsMultiVirusPlate() && provider instanceof NabAssayProvider)
if (supportsMultiVirusPlate() && provider instanceof NabAssayProvider nabProvider && template != null)
{
Domain domain = ((NabAssayProvider)provider).getVirusWellGroupDomain(context.getProtocol());
Domain domain = nabProvider.getVirusWellGroupDomain(context.getProtocol());

if (domain != null)
{
Expand Down