itizawa 6 лет назад
Родитель
Сommit
994f1734ea

+ 2 - 2
src/client/js/services/AdminNotificationContainer.js

@@ -24,7 +24,7 @@ export default class AdminNotificationContainer extends Container {
       isIncomingWebhookPrioritized: false,
       slackToken: '',
       userNotifications: [],
-      isNotificationOwnerPageEnabled: true,
+      isNotificationOwnerPageEnabled: false,
       isNotificationGroupPageEnabled: false,
       globalNotifications: [],
     };
@@ -51,7 +51,7 @@ export default class AdminNotificationContainer extends Container {
         isIncomingWebhookPrioritized: notificationParams.isIncomingWebhookPrioritized || false,
         slackToken: notificationParams.slackToken || '',
         userNotifications: notificationParams.userNotifications || [],
-        // isNotificationOwnerPageEnabled: notificationParams.isNotificationOwnerPageEnabled,
+        isNotificationOwnerPageEnabled: notificationParams.isNotificationOwnerPageEnabled,
         isNotificationGroupPageEnabled: notificationParams.isNotificationGroupPageEnabled,
         globalNotifications: notificationParams.globalNotifications || [],
       });

+ 3 - 0
src/server/models/config.js

@@ -117,6 +117,9 @@ module.exports = function(crowi) {
       'customize:isEnabledStaleNotification': false,
       'customize:isAllReplyShown': false,
 
+      'notification:owner-page:isEnabled': false,
+      'notification:group-page:isEnabled': false,
+
       'importer:esa:team_name': undefined,
       'importer:esa:access_token': undefined,
       'importer:qiita:team_name': undefined,

+ 0 - 2
src/server/service/global-notification/index.js

@@ -65,10 +65,8 @@ class GlobalNotificationService {
       case this.Page.GRANT_SPECIFIED:
         return false;
       case this.Page.GRANT_OWNER:
-        // TODO GW 1271 switch isEnabled
         return (this.crowi.configManager.getConfig('crowi', 'notification:owner-page:isEnabled') || false);
       case this.Page.GRANT_USER_GROUP:
-        // TODO GW 1271 switch isEnabled
         return (this.crowi.configManager.getConfig('crowi', 'notification:group-page:isEnabled') || false);
     }
   }