|
@@ -591,7 +591,7 @@ class PageService {
|
|
|
.pipe(writeStream);
|
|
.pipe(writeStream);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- async revertDeletedPages(pages, user) {
|
|
|
|
|
|
|
+ async revertDeletedDescendants(pages, user) {
|
|
|
const Page = this.crowi.model('Page');
|
|
const Page = this.crowi.model('Page');
|
|
|
const pageCollection = mongoose.connection.collection('pages');
|
|
const pageCollection = mongoose.connection.collection('pages');
|
|
|
const revisionCollection = mongoose.connection.collection('revisions');
|
|
const revisionCollection = mongoose.connection.collection('revisions');
|
|
@@ -689,14 +689,14 @@ class PageService {
|
|
|
.lean()
|
|
.lean()
|
|
|
.cursor();
|
|
.cursor();
|
|
|
|
|
|
|
|
- const revertDeletedPages = this.revertDeletedPages.bind(this);
|
|
|
|
|
|
|
+ const revertDeletedDescendants = this.revertDeletedDescendants.bind(this);
|
|
|
let count = 0;
|
|
let count = 0;
|
|
|
const writeStream = new Writable({
|
|
const writeStream = new Writable({
|
|
|
objectMode: true,
|
|
objectMode: true,
|
|
|
async write(batch, encoding, callback) {
|
|
async write(batch, encoding, callback) {
|
|
|
try {
|
|
try {
|
|
|
count += batch.length;
|
|
count += batch.length;
|
|
|
- revertDeletedPages(batch, user);
|
|
|
|
|
|
|
+ revertDeletedDescendants(batch, user);
|
|
|
logger.debug(`Reverting pages progressing: (count=${count})`);
|
|
logger.debug(`Reverting pages progressing: (count=${count})`);
|
|
|
}
|
|
}
|
|
|
catch (err) {
|
|
catch (err) {
|