mizozobu 6 лет назад
Родитель
Сommit
4e275d4683
2 измененных файлов с 4 добавлено и 6 удалено
  1. 3 4
      src/server/routes/login.js
  2. 1 2
      src/server/routes/page.js

+ 3 - 4
src/server/routes/login.js

@@ -8,11 +8,10 @@ module.exports = function(crowi, app) {
   const logger = require('@alias/logger')('growi:routes:login');
   const path = require('path');
   const async = require('async');
-  const config = crowi.getConfig();
   const mailer = crowi.getMailer();
   const User = crowi.model('User');
   const Config = crowi.model('Config');
-  const { configManager } = crowi;
+  const { configManager, appService } = crowi;
 
   const actions = {};
 
@@ -156,7 +155,7 @@ module.exports = function(crowi, app) {
 
 
           // 作成後、承認が必要なモードなら、管理者に通知する
-          const appTitle = Config.appTitle(config);
+          const appTitle = appService.getAppTitle();
           if (configManager.getConfig('crowi', 'security:registrationMode') === Config.SECURITY_REGISTRATION_MODE_RESTRICTED) {
             // TODO send mail
             User.findAdmins((err, admins) => {
@@ -170,7 +169,7 @@ module.exports = function(crowi, app) {
                     vars: {
                       createdUser: userData,
                       adminUser,
-                      url: crowi.appService.getSiteUrl(),
+                      url: appService.getSiteUrl(),
                       appTitle,
                     },
                   },

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

@@ -8,7 +8,6 @@ module.exports = function(crowi, app) {
 
   const Page = crowi.model('Page');
   const User = crowi.model('User');
-  const config = crowi.getConfig();
   const Bookmark = crowi.model('Bookmark');
   const PageTagRelation = crowi.model('PageTagRelation');
   const UpdatePost = crowi.model('UpdatePost');
@@ -98,7 +97,7 @@ module.exports = function(crowi, app) {
         logger.error('Error occured in updating slack channels: ', err);
       });
 
-    if (slackNotificationService.hasSlackConfig(config)) {
+    if (slackNotificationService.hasSlackConfig()) {
       const promises = slackChannels.split(',').map((chan) => {
         return crowi.slack.postPage(page, user, chan, updateOrCreate, previousRevision);
       });