diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-24 01:45:05 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-24 01:45:05 +0530 |
| commit | 17ccb0a1a37c906c0151d3da5e92de3d94205924 (patch) | |
| tree | 189dde3719d5b37b126b50d08ddb8099a432ce95 /src | |
| parent | 9d3308dd8fbcbbd854c66a3e53ca4ba66853dd30 (diff) | |
groups and acl bugfix
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/util/GroupManager.tsx | 1 | ||||
| -rw-r--r-- | src/fields/util.ts | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/client/util/GroupManager.tsx b/src/client/util/GroupManager.tsx index 7d02b1e66..a727d21d0 100644 --- a/src/client/util/GroupManager.tsx +++ b/src/client/util/GroupManager.tsx @@ -48,6 +48,7 @@ export default class GroupManager extends React.Component<{}> { componentDidMount() { this.populateUsers(); + this.populateGroups(); } /** diff --git a/src/fields/util.ts b/src/fields/util.ts index 20b072786..cd1e24826 100644 --- a/src/fields/util.ts +++ b/src/fields/util.ts @@ -210,7 +210,8 @@ export function setter(target: any, in_prop: string | symbol | number, value: an return true; } - if (typeof prop === "string" && prop.startsWith("ACL") && !["Can Edit", "Can Add", "Can View", "Not Shared", undefined].includes(value)) return true; + if (typeof prop === "string" && prop.startsWith("ACL") && ((target.author && Doc.CurrentUserEmail !== target.author) || !["Can Edit", "Can Add", "Can View", "Not Shared", undefined].includes(value))) return true; + // if (typeof prop === "string" && prop.startsWith("ACL") && !["Can Edit", "Can Add", "Can View", "Not Shared", undefined].includes(value)) return true; if (typeof prop === "string" && prop !== "__id" && prop !== "__fields" && (prop.startsWith("_") || layoutProps.includes(prop))) { if (!prop.startsWith("_")) { |