yusuketk пре 5 година
родитељ
комит
66d548a9d8
1 измењених фајлова са 7 додато и 3 уклоњено
  1. 7 3
      src/client/js/services/AdminAppContainer.js

+ 7 - 3
src/client/js/services/AdminAppContainer.js

@@ -63,7 +63,7 @@ export default class AdminAppContainer extends Container {
       siteUrl: appSettingsParams.siteUrl,
       siteUrl: appSettingsParams.siteUrl,
       envSiteUrl: appSettingsParams.envSiteUrl,
       envSiteUrl: appSettingsParams.envSiteUrl,
       isSetSiteUrl: !!appSettingsParams.siteUrl,
       isSetSiteUrl: !!appSettingsParams.siteUrl,
-      // GW-3714 manage mailer status on server
+      // GW-3714 manage mailer state
       isMailerActive: true,
       isMailerActive: true,
       // isMailerActive: appSettingsParams.isMailerActive,
       // isMailerActive: appSettingsParams.isMailerActive,
       fromAddress: appSettingsParams.fromAddress,
       fromAddress: appSettingsParams.fromAddress,
@@ -265,7 +265,9 @@ export default class AdminAppContainer extends Container {
       smtpPassword: this.state.smtpPassword,
       smtpPassword: this.state.smtpPassword,
     });
     });
     const { mailSettingParams } = response.data;
     const { mailSettingParams } = response.data;
-    this.setState({ isMailerActive: mailSettingParams.isMailerActive });
+    // GW-3714 manage mailer state
+    this.setState({ isMailerActive: true });
+    // this.setState({ isMailerActive: mailSettingParams.isMailerActive });
     return mailSettingParams;
     return mailSettingParams;
   }
   }
 
 
@@ -280,7 +282,9 @@ export default class AdminAppContainer extends Container {
       sesSecretAccessKey: this.state.sesSecretAccessKey,
       sesSecretAccessKey: this.state.sesSecretAccessKey,
     });
     });
     const { mailSettingParams } = response.data;
     const { mailSettingParams } = response.data;
-    this.setState({ isMailerActive: mailSettingParams.isMailerActive });
+    // GW-3714 manage mailer state
+    this.setState({ isMailerActive: true });
+    // this.setState({ isMailerActive: mailSettingParams.isMailerActive });
     return mailSettingParams;
     return mailSettingParams;
   }
   }