diff options
| author | bobzel <zzzman@gmail.com> | 2020-08-12 13:13:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-12 13:13:35 -0400 |
| commit | c38249e8df315272783cf95439e62b4871a42502 (patch) | |
| tree | d3f9b89b33d216c4ca5d9b522b93b7b2831a5520 /src/client/util | |
| parent | e976cf57176b5ba8d758ccfd63d443c291781b4f (diff) | |
| parent | 56ae02ffc13d69f6e79f327ea99d154f03e0fd34 (diff) | |
Merge pull request #553 from browngraphicslab/acls_uv
A bunch of changes
Diffstat (limited to 'src/client/util')
| -rw-r--r-- | src/client/util/KeyCodes.ts | 2 | ||||
| -rw-r--r-- | src/client/util/SharingManager.tsx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/client/util/KeyCodes.ts b/src/client/util/KeyCodes.ts index cacb72a57..de2457a5a 100644 --- a/src/client/util/KeyCodes.ts +++ b/src/client/util/KeyCodes.ts @@ -131,6 +131,6 @@ export class KeyCodes { public static NUM_7: number = 55; public static NUM_8: number = 56; public static NUM_9: number = 57; - public static SUBSTRACT: number = 189; + public static SUBTRACT: number = 189; public static ADD: number = 187; }
\ No newline at end of file diff --git a/src/client/util/SharingManager.tsx b/src/client/util/SharingManager.tsx index d50a132f8..48a3c023f 100644 --- a/src/client/util/SharingManager.tsx +++ b/src/client/util/SharingManager.tsx @@ -179,6 +179,9 @@ export default class SharingManager extends React.Component<{}> { if (group.docsShared) DocListCast(group.docsShared).forEach(doc => Doc.IndexOf(doc, DocListCast(user.notificationDoc[storage])) === -1 && Doc.AddDocToList(user.notificationDoc, storage, doc)); } + /** + * Called from the properties sidebar to change permissions of a user. + */ shareFromPropertiesSidebar = (shareWith: string, permission: SharingPermissions, target: Doc) => { const user = this.users.find(({ user: { email } }) => email === (shareWith === "Me" ? Doc.CurrentUserEmail : shareWith)); if (user) this.setInternalSharing(user, permission, target); @@ -228,7 +231,6 @@ export default class SharingManager extends React.Component<{}> { const key = user.email.replace('.', '_'); const ACL = `ACL-${key}`; - target.author === Doc.CurrentUserEmail && distributeAcls(ACL, permission as SharingPermissions, target); if (permission !== SharingPermissions.None) { |