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

Merge pull request #105 from weseek/master

release v1.2.7
Yuki Takei 8 лет назад
Родитель
Сommit
27d516bba2
3 измененных файлов с 10 добавлено и 1 удалено
  1. 4 0
      CHANGES.md
  2. 5 0
      lib/routes/page.js
  3. 1 1
      package.json

+ 4 - 0
CHANGES.md

@@ -1,6 +1,10 @@
 CHANGES
 ========
 
+## 1.2.7
+
+* Fix: The problem that redirect doesn't work when using 'crowi-plus Simplified Behavior'
+
 ## 1.2.6
 
 * Fix: The problem that page_list widget doesn't show the picture of revision.author

+ 5 - 0
lib/routes/page.js

@@ -188,6 +188,11 @@ module.exports = function(crowi, app) {
 
     Page.findPage(path, req.user, req.query.revision)
     .then(function(page) {
+      // redirect
+      if (page.redirectTo) {
+        return res.redirect(encodeURI(page.redirectTo + '?redirectFrom=' + page.path));
+      }
+
       renderVars.page = page;
 
       if (page) {

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "crowi-plus",
-  "version": "1.2.6-RC",
+  "version": "1.2.8-RC",
   "description": "Enhanced Crowi",
   "tags": [
     "wiki",