zahmis пре 5 година
родитељ
комит
da947ff5a7

+ 2 - 2
src/client/js/components/Admin/App/AppSetting.jsx

@@ -118,7 +118,7 @@ class AppSetting extends React.Component {
                 id="radio-email-show"
                 className="custom-control-input"
                 name="mailVisibility"
-                checked={adminAppContainer.state.defaultEmailShow}
+                checked={adminAppContainer.state.isEmailPublishedForNewUser}
                 onChange={() => { adminAppContainer.changeIsEmailPublishedForNewUserShow(true) }}
               />
               <label className="custom-control-label" htmlFor="radio-email-show">{t('Show')}</label>
@@ -130,7 +130,7 @@ class AppSetting extends React.Component {
                 id="radio-email-hide"
                 className="custom-control-input"
                 name="mailVisibility"
-                checked={!adminAppContainer.state.defaultEmailShow}
+                checked={!adminAppContainer.state.isEmailPublishedForNewUser}
                 onChange={() => { adminAppContainer.changeIsEmailPublishedForNewUserShow(false) }}
               />
               <label className="custom-control-label" htmlFor="radio-email-hide">{t('Hide')}</label>

+ 1 - 2
src/client/js/services/AdminAppContainer.js

@@ -19,7 +19,7 @@ export default class AdminAppContainer extends Container {
       title: this.dummyTitle,
       confidential: '',
       globalLang: '',
-      isEmailPublishedForNewUser: true,
+      isEmailPublishedForNewUser: '',
       fileUpload: '',
 
       siteUrl: '',
@@ -74,7 +74,6 @@ export default class AdminAppContainer extends Container {
   async retrieveAppSettingsData() {
     const response = await this.appContainer.apiv3.get('/app-settings/');
     const { appSettingsParams } = response.data;
-    console.log(appSettingsParams);
     this.setState({
       title: appSettingsParams.title,
       confidential: appSettingsParams.confidential,

+ 1 - 1
src/server/routes/apiv3/app-settings.js

@@ -296,7 +296,7 @@ module.exports = (crowi) => {
       'app:title': req.body.title,
       'app:confidential': req.body.confidential,
       'app:globalLang': req.body.globalLang,
-      'customize:isEmailPublishedForNewUser': req.body.defaultEmailShow,
+      'customize:isEmailPublishedForNewUser': req.body.isEmailPublishedForNewUser,
       'app:fileUpload': req.body.fileUpload,
     };
     try {