|
|
@@ -138,6 +138,14 @@ module.exports = function(crowi) {
|
|
|
};
|
|
|
}
|
|
|
|
|
|
+ function getDefaultNotificationConfigs() {
|
|
|
+ return {
|
|
|
+ 'slack:isIncomingWebhookPrioritized': false,
|
|
|
+ 'slack:incomingWebhookUrl': '',
|
|
|
+ 'slack:token': '',
|
|
|
+ };
|
|
|
+ }
|
|
|
+
|
|
|
function getValueForCrowiNS(config, key) {
|
|
|
crowi.configManager.getConfig('crowi', key);
|
|
|
// // return the default value if undefined
|
|
|
@@ -179,6 +187,13 @@ module.exports = function(crowi) {
|
|
|
return getDefaultMarkdownConfigs();
|
|
|
};
|
|
|
|
|
|
+ /**
|
|
|
+ * It is deprecated to use this for anything other than ConfigLoader#load.
|
|
|
+ */
|
|
|
+ configSchema.statics.getDefaultNotificationConfigsObject = function() {
|
|
|
+ return getDefaultNotificationConfigs();
|
|
|
+ };
|
|
|
+
|
|
|
configSchema.statics.getRestrictGuestModeLabels = function() {
|
|
|
const labels = {};
|
|
|
labels[SECURITY_RESTRICT_GUEST_MODE_DENY] = 'security_setting.guest_mode.deny';
|
|
|
@@ -229,29 +244,6 @@ module.exports = function(crowi) {
|
|
|
// });
|
|
|
// };
|
|
|
|
|
|
- configSchema.statics.setupConfigFormData = function(ns, config) {
|
|
|
- let defaultConfig = {};
|
|
|
-
|
|
|
- // set Default Settings
|
|
|
- if (ns === 'crowi') {
|
|
|
- defaultConfig = getDefaultCrowiConfigs();
|
|
|
- }
|
|
|
- else if (ns === 'markdown') {
|
|
|
- defaultConfig = getDefaultMarkdownConfigs();
|
|
|
- }
|
|
|
-
|
|
|
- if (!defaultConfig[ns]) {
|
|
|
- defaultConfig[ns] = {};
|
|
|
- }
|
|
|
- Object.keys(config[ns] || {}).forEach((key) => {
|
|
|
- if (config[ns][key] !== undefined) {
|
|
|
- defaultConfig[key] = config[ns][key];
|
|
|
- }
|
|
|
- });
|
|
|
- return defaultConfig;
|
|
|
- };
|
|
|
-
|
|
|
-
|
|
|
configSchema.statics.updateNamespaceByArray = function(ns, configs, callback) {
|
|
|
const Config = this;
|
|
|
if (configs.length < 0) {
|
|
|
@@ -611,30 +603,30 @@ module.exports = function(crowi) {
|
|
|
return (!!config.notification['slack:token']);
|
|
|
};
|
|
|
|
|
|
- configSchema.statics.getLocalconfig = function(config) {
|
|
|
+ configSchema.statics.getLocalconfig = function() { // CONF.RF: これも別のメソッドにする
|
|
|
const Config = this;
|
|
|
const env = process.env;
|
|
|
|
|
|
const localConfig = {
|
|
|
crowi: {
|
|
|
title: Config.appTitle(crowi),
|
|
|
- url: crowi.configManager.getSiteUrl(),
|
|
|
+ url: crowi.appService.getSiteUrl(),
|
|
|
},
|
|
|
upload: {
|
|
|
- image: Config.isUploadable(config),
|
|
|
- file: Config.fileUploadEnabled(config),
|
|
|
+ image: crowi.configManager.getIsUploadable(),
|
|
|
+ file: crowi.configManager.getConfig('crowi', 'app:fileUpload'),
|
|
|
},
|
|
|
- behaviorType: Config.behaviorType(config),
|
|
|
- layoutType: Config.layoutType(config),
|
|
|
- isEnabledLinebreaks: Config.isEnabledLinebreaks(config),
|
|
|
- isEnabledLinebreaksInComments: Config.isEnabledLinebreaksInComments(config),
|
|
|
- isEnabledXssPrevention: Config.isEnabledXssPrevention(config),
|
|
|
- xssOption: Config.xssOption(config),
|
|
|
- tagWhiteList: Config.tagWhiteList(config),
|
|
|
- attrWhiteList: Config.attrWhiteList(config),
|
|
|
- highlightJsStyleBorder: Config.highlightJsStyleBorder(config),
|
|
|
- isSavedStatesOfTabChanges: Config.isSavedStatesOfTabChanges(config),
|
|
|
- hasSlackConfig: Config.hasSlackConfig(config),
|
|
|
+ behaviorType: crowi.configManager.getConfig('crowi', 'customize:behavior'),
|
|
|
+ layoutType: crowi.configManager.getConfig('crowi', 'customize:layout'),
|
|
|
+ isEnabledLinebreaks: crowi.configManager.getConfig('markdown', 'markdown:isEnabledLinebreaks'),
|
|
|
+ isEnabledLinebreaksInComments: crowi.configManager.getConfig('markdown', 'markdown:isEnabledLinebreaksInComments'),
|
|
|
+ isEnabledXssPrevention: crowi.configManager.getConfig('markdown', 'markdown:xss:isEnabledPrevention'),
|
|
|
+ xssOption: crowi.configManager.getConfig('markdown', 'markdown:xss:option'),
|
|
|
+ tagWhiteList: crowi.xssService.getTagWhiteList(),
|
|
|
+ attrWhiteList: crowi.xssService.getAttrWhiteList(),
|
|
|
+ highlightJsStyleBorder: crowi.configManager.getConfig('crowi', 'customize:highlightJsStyleBorder'),
|
|
|
+ isSavedStatesOfTabChanges: crowi.configManager.getConfig('crowi', 'customize:isSavedStatesOfTabChanges'),
|
|
|
+ hasSlackConfig: crowi.configManager.getConfig('crowi', 'customize:behavior'),
|
|
|
env: {
|
|
|
PLANTUML_URI: env.PLANTUML_URI || null,
|
|
|
BLOCKDIAG_URI: env.BLOCKDIAG_URI || null,
|
|
|
@@ -642,9 +634,9 @@ module.exports = function(crowi) {
|
|
|
MATHJAX: env.MATHJAX || null,
|
|
|
NO_CDN: env.NO_CDN || null,
|
|
|
},
|
|
|
- recentCreatedLimit: Config.showRecentCreatedNumber(config),
|
|
|
- isAclEnabled: !Config.isPublicWikiOnly(config),
|
|
|
- globalLang: Config.globalLang(config),
|
|
|
+ recentCreatedLimit: crowi.configManager.getConfig('crowi', 'customize:showRecentCreatedNumber'),
|
|
|
+ isAclEnabled: !crowi.aclService.getIsPublicWikiOnly(),
|
|
|
+ globalLang: crowi.configManager.getConfig('crowi', 'app:globalLang'),
|
|
|
};
|
|
|
|
|
|
return localConfig;
|