Merge 23.11 to develop

LabKey · Nov 8, 2023 · 6d506bd · 6d506bd
2 parents 0123ed8 + 30738a7
commit 6d506bd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/resources/schemas/dbscripts/postgresql/targetedms-23.004-23.005.sql b/resources/schemas/dbscripts/postgresql/targetedms-23.004-23.005.sql
@@ -0,0 +1,4 @@
+ALTER TABLE targetedms.molecule ALTER COLUMN customionname TYPE TEXT;
+ALTER TABLE targetedms.moleculeprecursor ALTER COLUMN customionname TYPE TEXT;
+ALTER TABLE targetedms.moleculetransition ALTER COLUMN customionname TYPE TEXT;
+ALTER TABLE targetedms.excludedprecursors ALTER COLUMN customionname TYPE TEXT;
diff --git a/resources/schemas/dbscripts/sqlserver/targetedms-23.004-23.005.sql b/resources/schemas/dbscripts/sqlserver/targetedms-23.004-23.005.sql
@@ -0,0 +1,4 @@
+ALTER TABLE targetedms.molecule ALTER COLUMN customionname NVARCHAR(MAX);
+ALTER TABLE targetedms.moleculeprecursor ALTER COLUMN customionname NVARCHAR(MAX);
+ALTER TABLE targetedms.moleculetransition ALTER COLUMN customionname NVARCHAR(MAX);
+ALTER TABLE targetedms.excludedprecursors ALTER COLUMN customionname NVARCHAR(MAX);
diff --git a/src/org/labkey/targetedms/TargetedMSModule.java b/src/org/labkey/targetedms/TargetedMSModule.java
@@ -221,7 +221,7 @@ public String getName()
     @Override
     public Double getSchemaVersion()
     {
-        return 23.004;
+        return 23.005;
     }
 
     @Override

diff --git a/src/org/labkey/targetedms/query/SampleFileTable.java b/src/org/labkey/targetedms/query/SampleFileTable.java
@@ -182,15 +182,16 @@ public SampleFileTable(TargetedMSSchema schema, ContainerFilter cf, @Nullable Ta
 
             if (matchingContainers.size() == 1 && matchingSampleTypeLSIDs.size() == 1)
             {
+                Container matchingContainer = matchingContainers.iterator().next();
                 ExpSampleType sampleType = SampleTypeService.get().getSampleType(matchingSampleTypeLSIDs.iterator().next());
                 if (sampleType != null)
                 {
-                    ActionURL sampleUrl = PageFlowUtil.urlProvider(ExperimentUrls.class, true).getMaterialDetailsBaseURL(sampleType.getContainer(), SAMPLE_FIELD_KEY + "/RowId");
+                    ActionURL sampleUrl = PageFlowUtil.urlProvider(ExperimentUrls.class, true).getMaterialDetailsBaseURL(matchingContainer, SAMPLE_FIELD_KEY + "/RowId");
                     DetailsURL url = new DetailsURL(sampleUrl, "rowId", FieldKey.fromParts(SAMPLE_FIELD_KEY, "RowId"));
                     url.setContainerContext(new ContainerContext.FieldKeyContext(FieldKey.fromParts(SAMPLE_FIELD_KEY, "Folder"), true), false);
                     url.setStrictContainerContextEval(true);
 
-                    return new QueryForeignKey.Builder(new SamplesSchema(getUserSchema().getUser(), matchingContainers.iterator().next()), null).
+                    return new QueryForeignKey.Builder(new SamplesSchema(getUserSchema().getUser(), matchingContainer), null).
                             table(sampleType.getName()).
                             key("Name").
                             url(url).