Merge branch 'master' into geireann_dash_components

1 files changed, 4 insertions, 3 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index acd323eca..934803c16 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -172,6 +172,7 @@ export class DocumentOptions {
     'acl-Public'?: string; // public permissions
     '_acl-Public'?: string; // public permissions
     type?: DTYPEt = new DTypeInfo('type of document', true);
+    type_collection?: COLLt = new CTypeInfo('how collection is rendered'); // sub type of a collection
     _type_collection?: COLLt = new CTypeInfo('how collection is rendered'); // sub type of a collection
     title?: STRt = new StrInfo('title of document');
     caption?: RichTextField;
@@ -1156,7 +1157,7 @@ export namespace Docs {
         }
 
         export function DockDocument(documents: Array<Doc>, config: string, options: DocumentOptions, id?: string) {
-            return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { treeViewFreezeChildren: 'remove|add', ...options, _type_collection: CollectionViewType.Docking, dockingConfig: config }, id);
+            return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { treeViewFreezeChildren: 'remove|add', ...options, type_collection: CollectionViewType.Docking, dockingConfig: config }, id);
         }
 
         export function DirectoryImportDocument(options: DocumentOptions = {}) {
@@ -1213,7 +1214,7 @@ export namespace DocUtils {
 
         const filterFacets: { [key: string]: { [value: string]: string } } = {}; // maps each filter key to an object with value=>modifier fields
         childFilters.forEach(filter => {
-            const fields = filter.split(':');
+            const fields = filter.split(Doc.FilterSep);
             const key = fields[0];
             const value = fields[1];
             const modifiers = fields[2];
@@ -1231,7 +1232,7 @@ export namespace DocUtils {
                       return false;
                   }
 
-                  for (const facetKey of Object.keys(filterFacets).filter(fkey => fkey !== 'cookies' && fkey !== Utils.noDragsDocFilter.split(':')[0])) {
+                  for (const facetKey of Object.keys(filterFacets).filter(fkey => fkey !== 'cookies' && fkey !== Utils.noDragsDocFilter.split(Doc.FilterSep)[0])) {
                       const facet = filterFacets[facetKey];
 
                       // facets that match some value in the field of the document (e.g. some text field)