diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-09-20 19:09:50 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-09-20 19:09:50 +0530 |
| commit | a453df4d9df855243005b83d8b1015c17d74d034 (patch) | |
| tree | d8d96cb3f35872013fe52ea3b336c4ecb8aac6b9 /src/client/views/DocumentDecorations.tsx | |
| parent | 3dc37b033e4218464019e10ea59a66249b2675a7 (diff) | |
| parent | b9735a34252459ee7f09bb58a49cc3da7a652ab7 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into acls_uv
Diffstat (limited to 'src/client/views/DocumentDecorations.tsx')
| -rw-r--r-- | src/client/views/DocumentDecorations.tsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx index 9a49093b4..96eba1869 100644 --- a/src/client/views/DocumentDecorations.tsx +++ b/src/client/views/DocumentDecorations.tsx @@ -580,7 +580,8 @@ export class DocumentDecorations extends React.Component<{}, { value: string }> } const canDelete = SelectionManager.SelectedDocuments().some(docView => { const collectionAcl = docView.props.ContainingCollectionView ? GetEffectiveAcl(docView.props.ContainingCollectionDoc?.[DataSym]) : AclEdit; - return !docView.props.Document._stayInCollection && (collectionAcl === AclAdmin || collectionAcl === AclEdit); + const docAcl = GetEffectiveAcl(docView.props.Document); + return !docView.props.Document._stayInCollection && (collectionAcl === AclAdmin || collectionAcl === AclEdit || docAcl === AclAdmin); }); const canOpen = SelectionManager.SelectedDocuments().some(docView => !docView.props.Document._stayInCollection); const closeIcon = !canDelete ? (null) : ( |