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

impl route and model functions

Yuki Takei 6 лет назад
Родитель
Сommit
1dc108393d
3 измененных файлов с 11 добавлено и 8 удалено
  1. 6 3
      src/server/models/page.js
  2. 3 3
      src/server/routes/page.js
  3. 2 2
      src/server/views/modal/rename.html

+ 6 - 3
src/server/models/page.js

@@ -1228,7 +1228,8 @@ module.exports = function(crowi) {
     const Page = this;
     const Revision = crowi.model('Revision');
     const path = pageData.path;
-    const createRedirectPage = options.createRedirectPage || 0;
+    const createRedirectPage = options.createRedirectPage || false;
+    const updateMetadata = options.updateMetadata || false;
     const socketClientId = options.socketClientId || null;
 
     // sanitize path
@@ -1236,8 +1237,10 @@ module.exports = function(crowi) {
 
     // update Page
     pageData.path = newPagePath;
-    pageData.lastUpdateUser = user;
-    pageData.updatedAt = Date.now();
+    if (updateMetadata) {
+      pageData.lastUpdateUser = user;
+      pageData.updatedAt = Date.now();
+    }
     const updatedPageData = await pageData.save();
 
     // update Rivisions

+ 3 - 3
src/server/routes/page.js

@@ -1047,11 +1047,11 @@ module.exports = function(crowi, app) {
     const previousRevision = req.body.revision_id || null;
     const newPagePath = pathUtils.normalizePath(req.body.new_path);
     const options = {
-      createRedirectPage: req.body.create_redirect || 0,
-      moveUnderTrees: req.body.move_trees || 0,
+      createRedirectPage: (req.body.create_redirect != null),
+      updateMetadata: (req.body.remain_metadata == null),
       socketClientId: +req.body.socketClientId || undefined,
     };
-    const isRecursively = req.body.recursively || 0;
+    const isRecursively = (req.body.recursively != null);
 
     if (!Page.isCreatableName(newPagePath)) {
       return res.json(ApiResponse.error(`Could not use the path '${newPagePath})'`, 'invalid_path'));

+ 2 - 2
src/server/views/modal/rename.html

@@ -36,7 +36,7 @@
           </div>
 
           <div class="checkbox checkbox-success">
-            <input name="create_redirect" id="cbRenameRedirect" value="1"  type="checkbox">
+            <input name="create_redirect" id="cbRenameRedirect" value="1" type="checkbox">
             <label for="cbRenameRedirect">
               {{ t('modal_rename.label.Redirect') }}
               <p class="help-block mt-0">{{ t('modal_rename.help.redirect', page.path) }}</p>
@@ -44,7 +44,7 @@
           </div>
 
           <div class="checkbox checkbox-inverse">
-            <input name="metadata" id="cbRenameMetadata" value="1" type="checkbox">
+            <input name="remain_metadata" id="cbRenameMetadata" value="1" type="checkbox">
             <label for="cbRenameMetadata">
               {{ t('modal_rename.label.Do not update metadata') }}
               <p class="help-block mt-0">{{ t('modal_rename.help.metadata') }}</p>