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

Merge pull request #3169 from weseek/fix/3168-consecutive-save-with-hackmd

Fix/3168 consecutive save with hackmd
Yuki Takei 5 лет назад
Родитель
Сommit
f91a3b802b
1 измененных файлов с 6 добавлено и 8 удалено
  1. 6 8
      src/server/models/serializers/page-serializer.js

+ 6 - 8
src/server/models/serializers/page-serializer.js

@@ -7,11 +7,6 @@ function depopulate(page, attributeName) {
   }
   }
 }
 }
 
 
-function depopulateRevisions(page) {
-  depopulate(page, 'revision');
-  depopulate(page, 'revisionHackmdSynced');
-}
-
 function serializeInsecureUserAttributes(page) {
 function serializeInsecureUserAttributes(page) {
   if (page.lastUpdateUser != null && page.lastUpdateUser._id != null) {
   if (page.lastUpdateUser != null && page.lastUpdateUser._id != null) {
     page.lastUpdateUser = serializeUserSecurely(page.lastUpdateUser);
     page.lastUpdateUser = serializeUserSecurely(page.lastUpdateUser);
@@ -25,7 +20,7 @@ function serializeInsecureUserAttributes(page) {
   return page;
   return page;
 }
 }
 
 
-function serializePageSecurely(page, shouldDepopulateRevisions = false) {
+function serializePageSecurely(page, shouldDepopulateRevision = false) {
   let serialized = page;
   let serialized = page;
 
 
   // invoke toObject if page is a model instance
   // invoke toObject if page is a model instance
@@ -33,9 +28,12 @@ function serializePageSecurely(page, shouldDepopulateRevisions = false) {
     serialized = page.toObject();
     serialized = page.toObject();
   }
   }
 
 
+  // depopulate revisionHackmdSynced
+  depopulate(page, 'revisionHackmdSynced');
+
   // optional depopulation
   // optional depopulation
-  if (shouldDepopulateRevisions) {
-    depopulateRevisions(serialized);
+  if (shouldDepopulateRevision) {
+    depopulate(page, 'revision');
   }
   }
 
 
   serializeInsecureUserAttributes(serialized);
   serializeInsecureUserAttributes(serialized);