rename

src/server/models/page.js

@@ -46,7 +46,7 @@ const pageSchema = new mongoose.Schema({
   liker: [{ type: ObjectId, ref: 'User' }],
   seenUsers: [{ type: ObjectId, ref: 'User' }],
   commentCount: { type: Number, default: 0 },
-  slackChannel: { type: String },
+  slackChannels: { type: String },
   pageIdOnHackmd: String,
   revisionHackmdSynced: { type: ObjectId, ref: 'Revision' }, // the revision that is synced to HackMD
   hasDraftOnHackmd: { type: Boolean }, // set true if revision and revisionHackmdSynced are same but HackMD document has modified
@@ -412,8 +412,8 @@ module.exports = function(crowi) {
     return saved;
   };
 
-  pageSchema.methods.updateSlackChannel = function(slackChannel) {
-    this.slackChannel = slackChannel;
+  pageSchema.methods.updateSlackChannels = function(slackChannels) {
+    this.slackChannels = slackChannels;
 
     return this.save();
   };

src/server/routes/comment.js

@@ -271,7 +271,7 @@ module.exports = function(crowi, app) {
       const user = await User.findUserByUsername(req.user.username);
       const channelsStr = slackNotificationForm.slackChannels || null;
 
-      page.updateSlackChannel(channelsStr).catch((err) => {
+      page.updateSlackChannels(channelsStr).catch((err) => {
         logger.error('Error occured in updating slack channels: ', err);
       });
 

src/server/routes/page.js

@@ -206,7 +206,7 @@ module.exports = function(crowi, app) {
    * @param {string} previousRevision
    */
   async function notifyToSlackByUser(page, user, slackChannelsStr, updateOrCreate, previousRevision) {
-    await page.updateSlackChannel(slackChannelsStr)
+    await page.updateSlackChannels(slackChannelsStr)
       .catch((err) => {
         logger.error('Error occured in updating slack channels: ', err);
       });
@@ -269,10 +269,6 @@ module.exports = function(crowi, app) {
     renderVars.grantedGroupName = page.grantedGroup ? page.grantedGroup.name : null;
   }
 
-  function addRenderVarsForSlack(renderVars, page) {
-    renderVars.slack = page.slackChannels;
-  }
-
   async function addRenderVarsForDescendants(renderVars, path, requestUser, offset, limit, isRegExpEscapedFromPath) {
     const SEENER_THRESHOLD = 10;
 
@@ -350,7 +346,6 @@ module.exports = function(crowi, app) {
     portalPage = await portalPage.populateDataToShowRevision();
 
     addRenderVarsForPage(renderVars, portalPage);
-    addRenderVarsForSlack(renderVars, portalPage);
 
     const sharelinksNumber = await ShareLink.countDocuments({ relatedPage: portalPage._id });
     renderVars.sharelinksNumber = sharelinksNumber;
@@ -399,13 +394,12 @@ module.exports = function(crowi, app) {
     page = await page.populateDataToShowRevision();
     addRenderVarsForPage(renderVars, page);
     addRenderVarsForScope(renderVars, page);
-    addRenderVarsForSlack(renderVars, page);
 
     await addRenderVarsForDescendants(renderVars, path, req.user, offset, limit, true);
 
     const sharelinksNumber = await ShareLink.countDocuments({ relatedPage: page._id });
     renderVars.sharelinksNumber = sharelinksNumber;
-
+    console.log(renderVars);
     if (isUserPage(page.path)) {
       // change template
       view = 'layout-growi/user_page';

src/server/service/user-notification/index.js

@@ -25,7 +25,7 @@ class UserNotificationService {
   async fire(page, user, slackChannelsStr, updateOrCreate, previousRevision) {
     const { slackNotificationService, slack } = this.crowi;
 
-    await page.updateSlackChannel(slackChannelsStr);
+    await page.updateSlackChannels(slackChannelsStr);
 
     if (!slackNotificationService.hasSlackConfig()) {
       throw new Error('slackNotificationService has not been set up');