yuto-o 4 лет назад
Родитель
Сommit
19294b89be

+ 2 - 3
packages/app/src/server/models/revision.js

@@ -90,9 +90,8 @@ module.exports = function(crowi) {
     }));
   };
 
-  revisionSchema.statics.findLatestRevisionByPathPopulatedWithAuthor = async(path) => {
-    const Revision = this;
-    return (await Revision.find({ path }).sort({ createdAt: -1 }).limit(1).populate('author'))[0];
+  revisionSchema.statics.findLatestRevisionByPathPopulatedWithAuthor = async function(path) {
+    return (await this.find({ path }).sort({ createdAt: -1 }).limit(1).populate('author'))[0];
   };
 
   return mongoose.model('Revision', revisionSchema);

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

@@ -833,8 +833,7 @@ module.exports = function(crowi, app) {
     if (page != null && revisionId != null && !page.isUpdatable(revisionId)) {
       // when isUpdatable is false, originRevision is the reqested revision
       const originRevision = await Revision.findById(revisionId).populate('author');
-      let latestRevision = await Revision.find({ path: originRevision.path }).sort({ createdAt: -1 }).limit(1).populate('author');
-      latestRevision = latestRevision[0];
+      const latestRevision = await Revision.findLatestRevisionByPathPopulatedWithAuthor(originRevision.path);
 
       const revisions = {};