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

Merge branch 'master' into support/use-eslint-autofixonsave

# Conflicts:
#	src/server/routes/page.js
Yuki Takei 7 лет назад
Родитель
Сommit
10ecb74975
4 измененных файлов с 5 добавлено и 3 удалено
  1. 2 1
      CHANGES.md
  2. 1 1
      package.json
  3. 1 0
      src/server/routes/page.js
  4. 1 1
      src/server/util/slack.js

+ 2 - 1
CHANGES.md

@@ -3,7 +3,8 @@ CHANGES
 
 
 ## 3.4.2-RC
 ## 3.4.2-RC
 
 
-* 
+* Fix: Nofitication to Slack doesn't work
+    * Introduced by 3.4.0
 
 
 ## 3.4.1
 ## 3.4.1
 
 

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "growi",
   "name": "growi",
-  "version": "3.4.2-RC",
+  "version": "3.4.3-RC",
   "description": "Team collaboration software using markdown",
   "description": "Team collaboration software using markdown",
   "tags": [
   "tags": [
     "wiki",
     "wiki",

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

@@ -95,6 +95,7 @@ module.exports = function(crowi, app) {
 
 
     if (crowi.slack) {
     if (crowi.slack) {
       const promises = slackChannels.split(',').map((chan) => {
       const promises = slackChannels.split(',').map((chan) => {
+        logger.debug('crowi.slack is exist', crowi.slack);
         return crowi.slack.postPage(page, user, chan, updateOrCreate, previousRevision);
         return crowi.slack.postPage(page, user, chan, updateOrCreate, previousRevision);
       });
       });
 
 

+ 1 - 1
src/server/util/slack.js

@@ -123,7 +123,7 @@ module.exports = function(crowi) {
       author_link: urljoin(url, 'user', user.username),
       author_link: urljoin(url, 'user', user.username),
       author_icon: user.image,
       author_icon: user.image,
       title: page.path,
       title: page.path,
-      title_link: urljoin(url, page._id),
+      title_link: urljoin(url, page.id),
       text: body,
       text: body,
       mrkdwn_in: ['text'],
       mrkdwn_in: ['text'],
     };
     };