diff options
| author | Tyler Schicke <tschicke@gmail.com> | 2020-01-11 14:10:59 -0800 |
|---|---|---|
| committer | Tyler Schicke <tschicke@gmail.com> | 2020-01-11 14:10:59 -0800 |
| commit | f24fcf4df595542d47ec9b98e173979656db68bd (patch) | |
| tree | daf32c16ac99add88460980a6f19925806eb51da /src/client/views/collections/CollectionViewChromes.tsx | |
| parent | a2f423fa31e649805e7dd087037a5fe262c44a4a (diff) | |
| parent | 54a241ff71abc07a5dbdebce1b614f1024a767e6 (diff) | |
Merge branch 'master' of github.com:browngraphicslab/Dash-Web into no_db
Diffstat (limited to 'src/client/views/collections/CollectionViewChromes.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionViewChromes.tsx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionViewChromes.tsx b/src/client/views/collections/CollectionViewChromes.tsx index a870b6043..184504e5a 100644 --- a/src/client/views/collections/CollectionViewChromes.tsx +++ b/src/client/views/collections/CollectionViewChromes.tsx @@ -217,7 +217,11 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewChro `(${keyRestrictionScript}) ${dateRestrictionScript.length ? "&&" : ""} ${dateRestrictionScript}` : "true"; - this.props.CollectionView.props.Document.viewSpecScript = ScriptField.MakeFunction(fullScript, { doc: Doc.name }); + const docFilter = StrCast(this.props.CollectionView.props.Document.docFilter); + const finalScript = docFilter && !fullScript.startsWith("(())") ? `${fullScript} ${docFilter ? "&&" : ""} (${docFilter})` : + docFilter ? docFilter : fullScript; + + this.props.CollectionView.props.Document.viewSpecScript = ScriptField.MakeFunction(finalScript, { doc: Doc.name }); } @action |