Merge pull request #70 from LabKey/fb_merge_discvr-20.11

Merge discvr-20.11 to develop

Author: bbimber

LDK/resources/web/LDK/field/SimpleCombo.js

@@ -25,6 +25,14 @@ Ext4.define('LDK.form.field.SimpleCombo', {
         });
 
         this.callParent(arguments);
+
+        if (this.initialValues) {
+            if (!Ext4.isArray(this.initialValues)) {
+                this.initialValues = this.initialValues.split(';');
+            }
+
+            this.setValue(this.initialValues);
+        }
     },
 
     parseStoreValues: function(){

laboratory/resources/folderTypes/File Sharing.folderType.xml

@@ -0,0 +1,24 @@
+<ft:folderType xmlns:ft="http://labkey.org/data/xml/folderType">
+    <ft:name>File Sharing</ft:name>
+    <ft:description>This folder type is designed for simple file sharing. It just has a files webpart</ft:description>
+    <ft:folderTabs>
+        <ft:folderTab>
+            <ft:name>overview</ft:name>
+            <ft:caption>Overview</ft:caption>
+            <ft:selectors>
+            </ft:selectors>
+            <ft:requiredWebParts>
+            </ft:requiredWebParts>
+            <ft:preferredWebParts>
+                <ft:webPart>
+                    <ft:name>Files</ft:name>
+                    <ft:location>body</ft:location>
+                </ft:webPart>
+            </ft:preferredWebParts>
+        </ft:folderTab>
+    </ft:folderTabs>
+    <ft:modules>
+        <ft:moduleName>Laboratory</ft:moduleName>
+    </ft:modules>
+    <ft:defaultModule>Laboratory</ft:defaultModule>
+</ft:folderType>

laboratory/resources/web/laboratory/window/WorkbookCreationWindow.js

@@ -126,7 +126,7 @@ Ext4.define('Laboratory.panel.WorkbookCreationPanel', {
         var urlParams = this.urlParams || {};
 
         var url = LABKEY.ActionURL.buildURL(controller, action, containerPath, urlParams);
-        if (url.length > 1200){
+        if (url.length > 1000){
             Ext4.create('Ext.form.Panel', {
                 url: LABKEY.ActionURL.buildURL(controller, action, containerPath),
                 method: 'POST',