yuken 3 лет назад
Родитель
Сommit
ade0d3f789

+ 2 - 5
packages/app/src/components/EmptyTrashModal.tsx

@@ -26,13 +26,10 @@ const EmptyTrashModal: FC = () => {
       return;
     }
 
-    const pageIdToRevisionIdMap = {};
-    emptyTrashModalData.pages.forEach((p) => { pageIdToRevisionIdMap[p.data._id] = p.data.revision as string });
+    const pageIds = emptyTrashModalData.pages.map(p => p.data._id);
 
     try {
-      await apiv3Delete('/pages/empty-trash', {
-        pageIdToRevisionIdMap,
-      });
+      await apiv3Delete('/pages/empty-trash', { pageIds });
       const onEmptiedTrash = emptyTrashModalData.opts?.onEmptiedTrash;
       if (onEmptiedTrash != null) {
         onEmptiedTrash();

+ 5 - 2
packages/app/src/server/routes/apiv3/pages.js

@@ -547,8 +547,11 @@ module.exports = (crowi) => {
    */
   router.delete('/empty-trash', accessTokenParser, loginRequired, adminRequired, csrf, apiV3FormValidator, async(req, res) => {
     const options = {};
-    const { pageIdToRevisionIdMap } = req.body;
-    const pageIds = Object.keys(pageIdToRevisionIdMap);
+    const { pageIds } = req.body;
+    // const { pageIdToRevisionIdMap } = req.body;
+    // const pageIds = Object.keys(pageIdToRevisionIdMap);
+
+    logger.error(`pageIds: ${pageIds}`);
 
     let pagesToDelete;