Просмотр исходного кода

add isEmailPublishedfornewuser

zahmis 5 лет назад
Родитель
Сommit
5a5d2355d4
2 измененных файлов с 8 добавлено и 1 удалено
  1. 7 0
      src/server/routes/apiv3/app-settings.js
  2. 1 1
      src/server/service/config-loader.js

+ 7 - 0
src/server/routes/apiv3/app-settings.js

@@ -38,6 +38,9 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  *          globalLang:
  *            type: string
  *            description: language set when create user
+ *          isEmailPubshedForNewUser:
+ *            type: boolean
+ *            description: default email show/hide setting when create user
  *          fileUpload:
  *            type: boolean
  *            description: enable upload file except image file
@@ -154,6 +157,7 @@ module.exports = (crowi) => {
       body('title').trim(),
       body('confidential'),
       body('globalLang').isIn(listLocaleIds()),
+      body('isEmailPubshedForNewUser').isBoolean(),
       body('fileUpload').isBoolean(),
     ],
     siteUrlSetting: [
@@ -219,6 +223,7 @@ module.exports = (crowi) => {
       title: crowi.configManager.getConfig('crowi', 'app:title'),
       confidential: crowi.configManager.getConfig('crowi', 'app:confidential'),
       globalLang: crowi.configManager.getConfig('crowi', 'app:globalLang'),
+      isEmailPubshedForNewUser: crowi.configManager.getConfig('crowi', 'app:isEmailPubshedForNewUser'),
       fileUpload: crowi.configManager.getConfig('crowi', 'app:fileUpload'),
       siteUrl: crowi.configManager.getConfig('crowi', 'app:siteUrl'),
       envSiteUrl: crowi.configManager.getConfigFromEnvVars('crowi', 'app:siteUrl'),
@@ -289,6 +294,7 @@ module.exports = (crowi) => {
       'app:title': req.body.title,
       'app:confidential': req.body.confidential,
       'app:globalLang': req.body.globalLang,
+      'app:isEmailPubshedForNewUser': req.body.isEmailPubshedForNewUser,
       'app:fileUpload': req.body.fileUpload,
     };
 
@@ -298,6 +304,7 @@ module.exports = (crowi) => {
         title: crowi.configManager.getConfig('crowi', 'app:title'),
         confidential: crowi.configManager.getConfig('crowi', 'app:confidential'),
         globalLang: crowi.configManager.getConfig('crowi', 'app:globalLang'),
+        isEmailPubshedForNewUser: crowi.configManager.getConfig('crowi', 'app:isEmailPubshedForNewUser'),
         fileUpload: crowi.configManager.getConfig('crowi', 'app:fileUpload'),
       };
       return res.apiv3({ appSettingParams });

+ 1 - 1
src/server/service/config-loader.js

@@ -400,7 +400,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
   },
   EMAIL_PUBLISHED_BY_ADMIN: {
     ns:      'crowi',
-    key:     'app:isEmailPubshedForNewUser',
+    key:     'app:isEmailPublishedForNewUser',
     type:    TYPES.BOOLEAN,
     default: true,
   },