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

Merge pull request #5272 from weseek/feat/remove-redirect-page-process-completely

feat: Removed redirect page process completely
Haku Mizuki 4 лет назад
Родитель
Сommit
2a0f76fc73

+ 1 - 1
packages/app/src/server/models/obsolete-page.js

@@ -738,7 +738,7 @@ export const getPageSchema = (crowi) => {
     return await findListFromBuilderAndViewer(builder, currentUser, showAnyoneKnowsLink, opt);
     return await findListFromBuilderAndViewer(builder, currentUser, showAnyoneKnowsLink, opt);
   };
   };
 
 
-  pageSchema.statics.findListByPageIds = async function(ids, option, excludeRedirect = true) {
+  pageSchema.statics.findListByPageIds = async function(ids, option) {
     const User = crowi.model('User');
     const User = crowi.model('User');
 
 
     const opt = Object.assign({}, option);
     const opt = Object.assign({}, option);

+ 6 - 0
packages/app/src/server/models/page-redirect.ts

@@ -26,4 +26,10 @@ const schema = new Schema<PageRedirectDocument, PageRedirectModel>({
   toPath: { type: String, required: true },
   toPath: { type: String, required: true },
 });
 });
 
 
+schema.statics.removePageRedirectByToPath = async function(toPath: string): Promise<void> {
+  await this.deleteMany({ toPath });
+
+  return;
+};
+
 export default getOrCreateModel<PageRedirectDocument, PageRedirectModel>('PageRedirect', schema);
 export default getOrCreateModel<PageRedirectDocument, PageRedirectModel>('PageRedirect', schema);

+ 1 - 1
packages/app/src/server/routes/page.js

@@ -1352,7 +1352,7 @@ module.exports = function(crowi, app) {
     const path = req.body.path;
     const path = req.body.path;
 
 
     try {
     try {
-      await Page.removeRedirectOriginPageByPath(path);
+      await PageRedirect.removePageRedirectByToPath(path);
       logger.debug('Redirect Page deleted', path);
       logger.debug('Redirect Page deleted', path);
     }
     }
     catch (err) {
     catch (err) {

+ 1 - 1
packages/app/src/server/service/page.ts

@@ -1948,7 +1948,7 @@ class PageService {
 
 
     let result;
     let result;
     try {
     try {
-      result = await Page.findListByPageIds(pageIds, null, false);
+      result = await Page.findListByPageIds(pageIds, null);
     }
     }
     catch (err) {
     catch (err) {
       logger.error('Failed to find pages by ids', err);
       logger.error('Failed to find pages by ids', err);