Merge pull request #79 from LabKey/fb_merge_discvr-21.3

bbimber · web-flow · commit 8bb7e811a192 · 2021-05-18T09:00:25.000-07:00
Merge discvr-21.3 to develop
diff --git a/LDK/resources/web/LDK/field/SimpleCombo.js b/LDK/resources/web/LDK/field/SimpleCombo.js
@@ -54,7 +54,7 @@ Ext4.define('LDK.form.field.SimpleCombo', {
 
     getSubmitValue: function(){
         var val = this.callParent(arguments);
-        if (!this.joinReturnValue) {
+        if (!Ext4.isArray(val) || !this.joinReturnValue) {
             return val;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ Ext4.define('LDK.form.field.SimpleCombo', {`
`54`	`54`
`55`	`55`	`getSubmitValue: function(){`
`56`	`56`	`var val = this.callParent(arguments);`
`57`		`- if (!this.joinReturnValue) {`
	`57`	`+ if (!Ext4.isArray(val) \|\| !this.joinReturnValue) {`
`58`	`58`	`return val;`
`59`	`59`	`}`
`60`	`60`