diff options
| author | bobzel <zzzman@gmail.com> | 2020-09-23 12:13:49 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-09-23 12:13:49 -0400 |
| commit | c5f64716fbeb8d7f750be6e6685cd297b90d938f (patch) | |
| tree | afa2a4b0147793f875db5959a7439329c356213c /src | |
| parent | c7d8dd124fcc4d427fe37085317fe63f9005d3f3 (diff) | |
fixed exception when changing acls in shared collection. fixed adding document to shared colleciton to not give permsissions to sharer automatically
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/collections/CollectionView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/search/SearchBox.tsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx index e35474b81..522f46280 100644 --- a/src/client/views/collections/CollectionView.tsx +++ b/src/client/views/collections/CollectionView.tsx @@ -144,7 +144,7 @@ export class CollectionView extends Touchable<FieldViewProps & CollectionViewCus added.forEach(d => { for (const [key, value] of Object.entries(this.props.Document[AclSym])) { if (d.author === key.substring(4).replace("_", ".") && !d.aliasOf) distributeAcls(key, SharingPermissions.Admin, d, true); - else if (this.props.Document[key] === SharingPermissions.Admin) distributeAcls(key, SharingPermissions.Add, d, true); + //else if (this.props.Document[key] === SharingPermissions.Admin) distributeAcls(key, SharingPermissions.Add, d, true); //else distributeAcls(key, this.AclMap.get(value) as SharingPermissions, d, true); } }); diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx index a6ac62ee4..b381bbfa9 100644 --- a/src/client/views/search/SearchBox.tsx +++ b/src/client/views/search/SearchBox.tsx @@ -183,7 +183,7 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc let newarray: Doc[] = []; while (docs.length > 0) { newarray = []; - docs.forEach(d => { + docs.filter(d => d).forEach(d => { const fieldKey = Doc.LayoutFieldKey(d); const annos = !Field.toString(Doc.LayoutField(d) as Field).includes("CollectionView"); const data = d[annos ? fieldKey + "-annotations" : fieldKey]; |