Просмотр исходного кода

Merge pull request #7932 from weseek/imprv/change-get-config-place

imprv: Chage getConfig place
Yuki Takei 2 лет назад
Родитель
Сommit
7e55b58335
2 измененных файлов с 5 добавлено и 3 удалено
  1. 3 2
      apps/app/src/pages/[[...path]].page.tsx
  2. 2 1
      apps/app/src/pages/share/[[...path]].page.tsx

+ 3 - 2
apps/app/src/pages/[[...path]].page.tsx

@@ -438,7 +438,7 @@ async function injectPageData(context: GetServerSidePropsContext, props: Props):
 
 
   const Page = crowi.model('Page') as PageModel;
   const Page = crowi.model('Page') as PageModel;
   const PageRedirect = mongooseModel('PageRedirect') as PageRedirectModel;
   const PageRedirect = mongooseModel('PageRedirect') as PageRedirectModel;
-  const { pageService } = crowi;
+  const { pageService, configManager } = crowi;
 
 
   let currentPathname = props.currentPathname;
   let currentPathname = props.currentPathname;
 
 
@@ -477,7 +477,8 @@ async function injectPageData(context: GetServerSidePropsContext, props: Props):
   if (page != null) {
   if (page != null) {
     page.initLatestRevisionField(revisionId);
     page.initLatestRevisionField(revisionId);
     props.isLatestRevision = page.isLatestRevision();
     props.isLatestRevision = page.isLatestRevision();
-    props.skipSSR = await skipSSR(page, props.ssrMaxRevisionBodyLength);
+    const ssrMaxRevisionBodyLength = configManager.getConfig('crowi', 'app:ssrMaxRevisionBodyLength');
+    props.skipSSR = await skipSSR(page, ssrMaxRevisionBodyLength);
     await page.populateDataToShowRevision(props.skipSSR); // shouldExcludeBody = skipSSR
     await page.populateDataToShowRevision(props.skipSSR); // shouldExcludeBody = skipSSR
   }
   }
 
 

+ 2 - 1
apps/app/src/pages/share/[[...path]].page.tsx

@@ -237,7 +237,8 @@ export const getServerSideProps: GetServerSideProps = async(context: GetServerSi
     }
     }
     else {
     else {
       props.isNotFound = false;
       props.isNotFound = false;
-      props.skipSSR = await skipSSR(shareLink.relatedPage, props.ssrMaxRevisionBodyLength);
+      const ssrMaxRevisionBodyLength = crowi.configManager.getConfig('crowi', 'app:ssrMaxRevisionBodyLength');
+      props.skipSSR = await skipSSR(shareLink.relatedPage, ssrMaxRevisionBodyLength);
       props.shareLinkRelatedPage = await shareLink.relatedPage.populateDataToShowRevision(props.skipSSR); // shouldExcludeBody = skipSSR
       props.shareLinkRelatedPage = await shareLink.relatedPage.populateDataToShowRevision(props.skipSSR); // shouldExcludeBody = skipSSR
       props.isExpired = shareLink.isExpired();
       props.isExpired = shareLink.isExpired();
       props.shareLink = shareLink.toObject();
       props.shareLink = shareLink.toObject();