Merge 21.11.0 to develop

labkey-teamcity · labkey-teamcity · commit ff28e7e8af68 · 2021-11-17T17:21:35.000Z
diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java b/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java
@@ -253,7 +253,9 @@ private void customizeTasks(AbstractTableInfo ti)
 
     private void customizeEncounterTable(AbstractTableInfo ti)
     {
-        ti.getMutableColumn("remark").setDisplayColumnFactory(new WhitespacePreservingDisplayColumnFactory());
+        var remark = ti.getMutableColumn("remark");
+        if (null != remark)
+            remark.setDisplayColumnFactory(new WhitespacePreservingDisplayColumnFactory());
     }
 
 //    species column moved to extensible column (in ehr.template.xml) - keep this code example. tjh

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,9 @@ private void customizeTasks(AbstractTableInfo ti)`
`253`	`253`
`254`	`254`	`private void customizeEncounterTable(AbstractTableInfo ti)`
`255`	`255`	`{`
`256`		`- ti.getMutableColumn("remark").setDisplayColumnFactory(new WhitespacePreservingDisplayColumnFactory());`
	`256`	`+ var remark = ti.getMutableColumn("remark");`
	`257`	`+ if (null != remark)`
	`258`	`+ remark.setDisplayColumnFactory(new WhitespacePreservingDisplayColumnFactory());`
`257`	`259`	`}`
`258`	`260`
`259`	`261`	`// species column moved to extensible column (in ehr.template.xml) - keep this code example. tjh`