Przeglądaj źródła

Removed code to check GRANT_RESTRICTED

Taichi Masuyama 4 lat temu
rodzic
commit
bb6c21711c

+ 0 - 1
packages/app/resource/locales/en_US/translation.json

@@ -662,7 +662,6 @@
       "success": "Successfully requested conversion.",
       "error": "Failed to request conversion.",
       "error_grant_invalid": "Page permissions are incorrect. Please correct it and try again.",
-      "error_page_restricted": "Pages in this path cannot be converted to v5 compatible format.",
       "error_page_not_found": "Page not found.",
       "error_duplicate_pages_found": "Multiple pages with the same path name were found. Please rename or delete and try again."
     }

+ 0 - 1
packages/app/resource/locales/ja_JP/translation.json

@@ -661,7 +661,6 @@
       "success": "正常に変換を開始しました",
       "error": "変換を開始できませんでした",
       "error_grant_invalid": "ページの権限が正しくありません。修正してから再度実行してください",
-      "error_page_restricted": "このパスのページは v5 互換形式に変換することが出来ません",
       "error_page_not_found": "ページが見つかりませんでした",
       "error_duplicate_pages_found": "同名のパスを持つページが複数見つかりました。リネームまたは削除してから再度実行してください"
     }

+ 0 - 1
packages/app/resource/locales/zh_CN/translation.json

@@ -948,7 +948,6 @@
       "success": "成功地请求转换。",
       "error": "请求转换失败。",
       "error_grant_invalid": "页面权限不正确。请更正并重试。",
-      "error_page_restricted": "此路径中的页面不能被转换为v5兼容格式。",
       "error_page_not_found": "没有找到页面。",
       "error_duplicate_pages_found": "发现多个具有相同路径名称的页面。请重新命名或删除并重试。"
     }

+ 0 - 3
packages/app/src/components/PrivateLegacyPages.tsx

@@ -405,9 +405,6 @@ const PrivateLegacyPages = (props: Props): JSX.Element => {
                 case V5ConversionErrCode.GRANT_INVALID:
                   toastError(t('private_legacy_pages.by_path_modal.error_grant_invalid'));
                   break;
-                case V5ConversionErrCode.PAGE_RESTRICTED:
-                  toastError(t('private_legacy_pages.by_path_modal.error_page_restricted'));
-                  break;
                 case V5ConversionErrCode.PAGE_NOT_FOUND:
                   toastError(t('private_legacy_pages.by_path_modal.error_page_not_found'));
                   break;

+ 0 - 1
packages/app/src/interfaces/errors/v5-conversion-error.ts

@@ -1,6 +1,5 @@
 export const V5ConversionErrCode = {
   GRANT_INVALID: 'GrantInvalid',
-  PAGE_RESTRICTED: 'PageRestricted',
   PAGE_NOT_FOUND: 'PageNotFound',
   DUPLICATE_PAGES_FOUND: 'DuplicatePagesFound',
 } as const;

+ 13 - 18
packages/app/src/server/service/page.ts

@@ -2278,26 +2278,21 @@ class PageService {
     /*
      * UserGroup & Owner validation
      */
-    if (grant !== Page.GRANT_RESTRICTED) {
-      let isGrantNormalized = false;
-      try {
-        const shouldCheckDescendants = true;
+    let isGrantNormalized = false;
+    try {
+      const shouldCheckDescendants = true;
 
-        isGrantNormalized = await this.crowi.pageGrantService.isGrantNormalized(user, path, grant, grantedUserIds, grantedGroupId, shouldCheckDescendants);
-      }
-      catch (err) {
-        logger.error(`Failed to validate grant of page at "${path}"`, err);
-        throw err;
-      }
-      if (!isGrantNormalized) {
-        throw new V5ConversionError(
-          'This page cannot be migrated since the selected grant or grantedGroup is not assignable to this page.',
-          V5ConversionErrCode.GRANT_INVALID,
-        );
-      }
+      isGrantNormalized = await this.crowi.pageGrantService.isGrantNormalized(user, path, grant, grantedUserIds, grantedGroupId, shouldCheckDescendants);
     }
-    else {
-      throw new V5ConversionError('Restricted pages can not be migrated', V5ConversionErrCode.PAGE_RESTRICTED);
+    catch (err) {
+      logger.error(`Failed to validate grant of page at "${path}"`, err);
+      throw err;
+    }
+    if (!isGrantNormalized) {
+      throw new V5ConversionError(
+        'This page cannot be migrated since the selected grant or grantedGroup is not assignable to this page.',
+        V5ConversionErrCode.GRANT_INVALID,
+      );
     }
 
     let pageOp;