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

join with ', ' and for crowi behavior

sou 7 лет назад
Родитель
Сommit
77b9123fbd

+ 16 - 1
lib/routes/page.js

@@ -298,7 +298,7 @@ module.exports = function(crowi, app) {
           else {
             return UpdatePost.findSettingsByPath(page.path)
             .then(function(data) {
-              renderVars.slack = data.map(e => e.channel).join(',');
+              renderVars.slack = data.map(e => e.channel).join(', ');
             }).catch(function(err) {
               debug('Error occured in getting slack channels', err);
             });
@@ -490,6 +490,7 @@ module.exports = function(crowi, app) {
       page: pageData,
       revision: pageData.revision || {},
       author: pageData.revision.author || false,
+      slack: '',
     };
     var userPage = isUserPage(pageData.path);
     var userData = null;
@@ -506,6 +507,20 @@ module.exports = function(crowi, app) {
         renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
       }
     })
+    .then(() => {
+      if (pageData.extended.slack) {
+        renderVars.slack = pageData.extended.slack;
+        return;
+      }
+      else {
+        return UpdatePost.findSettingsByPath(pageData.path)
+        .then(function(data) {
+          renderVars.slack = data.map(e => e.channel).join(', ');
+        }).catch(function(err) {
+          debug('Error occured in getting slack channels', err);
+        });
+      }
+    })
     .then(function() {
       if (userPage) {
         return User.findUserByUsername(User.getUsernameByPath(pageData.path))

+ 0 - 2
resource/js/components/PageComment/CommentForm.js

@@ -291,8 +291,6 @@ export default class CommentForm extends React.Component {
   }
 }
 
-
-
 CommentForm.propTypes = {
   crowi: PropTypes.object.isRequired,
   crowiOriginRenderer: PropTypes.object.isRequired,

+ 0 - 2
resource/js/components/SlackNotification.js

@@ -66,8 +66,6 @@ export default class SlackNotification extends React.Component {
   }
 }
 
-
-
 SlackNotification.propTypes = {
   crowi: PropTypes.object.isRequired,
   pageId: PropTypes.string,