|
|
@@ -423,15 +423,18 @@ module.exports = function(crowi, app) {
|
|
|
return res.json(ApiResponse.error('Empty pages cannot be single deleted', 'single_deletion_empty_pages'));
|
|
|
}
|
|
|
|
|
|
- let creator;
|
|
|
- if (page.isEmpty) {
|
|
|
- // If empty, the creator is inherited from the closest non-empty ancestor page.
|
|
|
- const notEmptyClosestAncestor = await Page.findNonEmptyClosestAncestor(page.path);
|
|
|
- creator = notEmptyClosestAncestor.creator;
|
|
|
- }
|
|
|
- else {
|
|
|
- creator = page.creator;
|
|
|
- }
|
|
|
+ // -- canDelete no longer needs creator,
|
|
|
+ // however it might be required to retrieve the closest non-empty ancestor page's owner -- 2024.02.09 Yuki Takei
|
|
|
+ //
|
|
|
+ // let creator;
|
|
|
+ // if (page.isEmpty) {
|
|
|
+ // // If empty, the creator is inherited from the closest non-empty ancestor page.
|
|
|
+ // const notEmptyClosestAncestor = await Page.findNonEmptyClosestAncestor(page.path);
|
|
|
+ // creator = notEmptyClosestAncestor.creator;
|
|
|
+ // }
|
|
|
+ // else {
|
|
|
+ // creator = page.creator;
|
|
|
+ // }
|
|
|
|
|
|
debug('Delete page', page._id, page.path);
|
|
|
|
|
|
@@ -465,7 +468,7 @@ module.exports = function(crowi, app) {
|
|
|
return res.json(ApiResponse.error('Someone could update this page, so couldn\'t delete.', 'outdated'));
|
|
|
}
|
|
|
|
|
|
- if (!crowi.pageService.canDelete(page, creator, req.user, isRecursively)) {
|
|
|
+ if (!crowi.pageService.canDelete(page, req.user, isRecursively)) {
|
|
|
return res.json(ApiResponse.error('You can not delete this page', 'user_not_admin'));
|
|
|
}
|
|
|
|