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

WIP: refactor models/page.js

fix api result of unlink
Yuki Takei 7 лет назад
Родитель
Сommit
5aeb5058c2
2 измененных файлов с 2 добавлено и 4 удалено
  1. 1 2
      src/client/js/legacy/crowi.js
  2. 1 2
      src/server/routes/page.js

+ 1 - 2
src/client/js/legacy/crowi.js

@@ -471,8 +471,7 @@ $(function() {
         $('#delete-errors').addClass('alert-danger');
         $('#delete-errors').addClass('alert-danger');
       }
       }
       else {
       else {
-        const page = res.page;
-        top.location.href = page.path + '?unlinked=true';
+        top.location.href = res.path + '?unlinked=true';
       }
       }
     });
     });
 
 

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

@@ -1040,9 +1040,8 @@ module.exports = function(crowi, app) {
       logger.error('Error occured while get setting', err);
       logger.error('Error occured while get setting', err);
       return res.json(ApiResponse.error('Failed to delete redirect page.'));
       return res.json(ApiResponse.error('Failed to delete redirect page.'));
     }
     }
-    const result = {};
-    result.page = page;   // TODO consider to use serializeToObj method -- 2018.08.06 Yuki Takei
 
 
+    const result = { path };
     return res.json(ApiResponse.success(result));
     return res.json(ApiResponse.success(result));
   };
   };