Shun Miyazawa 2 лет назад
Родитель
Сommit
dd5354cde8
2 измененных файлов с 6 добавлено и 7 удалено
  1. 5 0
      apps/app/src/server/models/page.ts
  2. 1 7
      apps/app/src/server/service/page/index.ts

+ 5 - 0
apps/app/src/server/models/page.ts

@@ -1126,6 +1126,11 @@ schema.methods.makeWip = function(disableTtl: boolean) {
   }
   }
 };
 };
 
 
+schema.methods.toggleWip = function(wip: boolean) {
+  this.wip = wip;
+  this.ttlTimestamp = undefined;
+};
+
 /*
 /*
  * Merge obsolete page model methods and define new methods which depend on crowi instance
  * Merge obsolete page model methods and define new methods which depend on crowi instance
  */
  */

+ 1 - 7
apps/app/src/server/service/page/index.ts

@@ -4147,13 +4147,7 @@ class PageService implements IPageService {
     const newPageData = pageData;
     const newPageData = pageData;
 
 
     // Once update it, it will no longer be subject to automatic deletion.
     // Once update it, it will no longer be subject to automatic deletion.
-    if (options.wip != null) {
-      newPageData.wip = options.wip;
-      newPageData.ttlTimestamp = undefined;
-    }
-    else {
-      pageData.publish();
-    }
+    newPageData.toggleWip(options.wip);
 
 
     // use the previous data if absent
     // use the previous data if absent
     const grant = options.grant ?? clonedPageData.grant;
     const grant = options.grant ?? clonedPageData.grant;