Преглед изворни кода

BugFix CustomizeService service detection

Yuki Takei пре 5 година
родитељ
комит
4c57864f20
2 измењених фајлова са 8 додато и 7 уклоњено
  1. 1 1
      src/server/crowi/index.js
  2. 7 6
      src/server/service/customize.js

+ 1 - 1
src/server/crowi/index.js

@@ -505,7 +505,7 @@ Crowi.prototype.setUpAcl = async function() {
 Crowi.prototype.setUpCustomize = async function() {
 Crowi.prototype.setUpCustomize = async function() {
   const CustomizeService = require('../service/customize');
   const CustomizeService = require('../service/customize');
   if (this.customizeService == null) {
   if (this.customizeService == null) {
-    this.customizeService = new CustomizeService(this.configManager, this.appService, this.xssService, this.configPubsub);
+    this.customizeService = new CustomizeService(this);
     this.customizeService.initCustomCss();
     this.customizeService.initCustomCss();
     this.customizeService.initCustomTitle();
     this.customizeService.initCustomTitle();
 
 

+ 7 - 6
src/server/service/customize.js

@@ -12,12 +12,13 @@ const ConfigPubsubMessageHandlable = require('./config-pubsub/handlable');
  */
  */
 class CustomizeService extends ConfigPubsubMessageHandlable {
 class CustomizeService extends ConfigPubsubMessageHandlable {
 
 
-  constructor(configManager, appService, xssService) {
+  constructor(crowi) {
     super();
     super();
 
 
-    this.configManager = configManager;
-    this.appService = appService;
-    this.xssService = xssService;
+    this.configManager = crowi.configManager;
+    this.configPubsub = crowi.configPubsub;
+    this.appService = crowi.appService;
+    this.xssService = crowi.xssService;
 
 
     this.lastLoadedAt = null;
     this.lastLoadedAt = null;
   }
   }
@@ -38,7 +39,7 @@ class CustomizeService extends ConfigPubsubMessageHandlable {
    * @inheritdoc
    * @inheritdoc
    */
    */
   async handleConfigPubsubMessage(configPubsubMessage) {
   async handleConfigPubsubMessage(configPubsubMessage) {
-    const { configManager } = this.appService;
+    const { configManager } = this;
 
 
     logger.info('Reset customized value by pubsub notification');
     logger.info('Reset customized value by pubsub notification');
     await configManager.loadConfigs();
     await configManager.loadConfigs();
@@ -47,7 +48,7 @@ class CustomizeService extends ConfigPubsubMessageHandlable {
   }
   }
 
 
   async publishUpdatedMessage() {
   async publishUpdatedMessage() {
-    const { configPubsub } = this.appService;
+    const { configPubsub } = this;
 
 
     if (configPubsub != null) {
     if (configPubsub != null) {
       const configPubsubMessage = new ConfigPubsubMessage('customizeServiceUpdated', { updatedAt: new Date() });
       const configPubsubMessage = new ConfigPubsubMessage('customizeServiceUpdated', { updatedAt: new Date() });