Przeglądaj źródła

Added a pcondition for grant public

Taichi Masuyama 3 lat temu
rodzic
commit
239c5fac28
1 zmienionych plików z 6 dodań i 2 usunięć
  1. 6 2
      packages/app/src/server/service/page-grant.ts

+ 6 - 2
packages/app/src/server/service/page-grant.ts

@@ -440,7 +440,12 @@ class PageGrantService {
       grant, grantedUsers, grantedGroup,
       grant, grantedUsers, grantedGroup,
     } = parent;
     } = parent;
 
 
-    if (grant === Page.GRANT_OWNER) {
+    if (grant === Page.GRANT_PUBLIC) {
+      data[Page.GRANT_PUBLIC] = null;
+      data[Page.GRANT_OWNER] = null;
+      data[Page.GRANT_USER_GROUP] = await UserGroupRelation.findAllUserGroupIdsRelatedToUser(user);
+    }
+    else if (grant === Page.GRANT_OWNER) {
       const grantedUser = grantedUsers[0];
       const grantedUser = grantedUsers[0];
 
 
       const isUserApplicable = grantedUser.toString() === user._id.toString();
       const isUserApplicable = grantedUser.toString() === user._id.toString();
@@ -449,7 +454,6 @@ class PageGrantService {
         data[Page.GRANT_OWNER] = null;
         data[Page.GRANT_OWNER] = null;
       }
       }
     }
     }
-
     else if (grant === Page.GRANT_USER_GROUP) {
     else if (grant === Page.GRANT_USER_GROUP) {
       const group = await UserGroup.findById(grantedGroup);
       const group = await UserGroup.findById(grantedGroup);
       if (group == null) {
       if (group == null) {