Browse Source

Merge pull request #11181 from growilabs/fix/9315-grant-data-parent-grant-whiteout

fix(page): Correct parent grant value in /grant-data endpoint
Yuki Takei 3 days ago
parent
commit
0d46d2a727

+ 2 - 1
apps/app/src/components/PageView/PageAlerts/FixPageGrantAlert/FixPageGrantAlert.tsx

@@ -71,7 +71,8 @@ export const FixPageGrantAlert = (): JSX.Element => {
   if (
   if (
     pageId == null ||
     pageId == null ||
     !hasParent ||
     !hasParent ||
-    !dataIsGrantNormalized?.isGrantNormalized
+    dataIsGrantNormalized?.isGrantNormalized == null ||
+    dataIsGrantNormalized.isGrantNormalized
   ) {
   ) {
     // biome-ignore lint/complexity/noUselessFragments: ignore
     // biome-ignore lint/complexity/noUselessFragments: ignore
     return <></>;
     return <></>;

+ 1 - 1
apps/app/src/server/routes/apiv3/page/index.ts

@@ -606,7 +606,7 @@ module.exports = (crowi: Crowi) => {
       const parentPageGroupGrantData =
       const parentPageGroupGrantData =
         await pageGrantService.getPageGroupGrantData(parentPage, req.user);
         await pageGrantService.getPageGroupGrantData(parentPage, req.user);
       const parentPageGrant: IPageGrantData = {
       const parentPageGrant: IPageGrantData = {
-        grant,
+        grant: parentPage.grant,
         groupGrantData: parentPageGroupGrantData,
         groupGrantData: parentPageGroupGrantData,
       };
       };