diff options
| author | bob <bcz@cs.brown.edu> | 2020-01-24 14:57:19 -0500 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2020-01-24 14:57:19 -0500 |
| commit | 557e0fd8c41fbae8ddc0ba34be786c912338db23 (patch) | |
| tree | 9c9c40bea33fb7cdcba97e47032a8eef0048ca7a /src/client/views/collections/CollectionViewChromes.tsx | |
| parent | 09c04577d23cbc15a4f408611bca71f42a565bd5 (diff) | |
docFilters are evaluated diretly instead of being converted to a viewScript.
Diffstat (limited to 'src/client/views/collections/CollectionViewChromes.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionViewChromes.tsx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/client/views/collections/CollectionViewChromes.tsx b/src/client/views/collections/CollectionViewChromes.tsx index 59d7a2671..94290b5b5 100644 --- a/src/client/views/collections/CollectionViewChromes.tsx +++ b/src/client/views/collections/CollectionViewChromes.tsx @@ -223,12 +223,7 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewChro `(${keyRestrictionScript}) ${dateRestrictionScript.length ? "&&" : ""} ${dateRestrictionScript}` : "true"; - const docFilter = Cast(this.props.CollectionView.props.Document._docFilter, listSpec("string"), []); - const docFilterText = Doc.MakeDocFilter(docFilter); - const finalScript = docFilterText && !fullScript.startsWith("(())") ? `${fullScript} ${docFilterText ? "&&" : ""} (${docFilterText})` : - docFilterText ? docFilterText : fullScript; - - this.props.CollectionView.props.Document.viewSpecScript = ScriptField.MakeFunction(finalScript, { doc: Doc.name }); + this.props.CollectionView.props.Document.viewSpecScript = ScriptField.MakeFunction(fullScript, { doc: Doc.name }); } @action |
