Browse Source

add getter

itizawa 6 years ago
parent
commit
a8c75724d0

+ 2 - 2
src/client/js/components/Admin/Security/SecuritySetting.jsx

@@ -64,7 +64,7 @@ class SecuritySetting extends React.Component {
               <div className="my-0 btn-group">
                 <div className="dropdown">
                   <button
-                    className={`btn btn-default dropdown-toggle w-100 ${adminGeneralSecurityContainer.state.wikiMode === 'public' && 'disabled'}`}
+                    className={`btn btn-default dropdown-toggle w-100 ${adminGeneralSecurityContainer.isWikiModeForced && 'disabled'}`}
                     type="button"
                     data-toggle="dropdown"
                     aria-haspopup="true"
@@ -101,7 +101,7 @@ class SecuritySetting extends React.Component {
               </div>
             </div>
           </div>
-          {adminGeneralSecurityContainer.state.wikiMode === 'public' && (
+          {adminGeneralSecurityContainer.isWikiModeForced && (
             <div className="row mb-5">
               <div className="col-xs-offset-3 col-xs-6 text-left">
                 <p className="alert alert-warning mt-2 text-left">

+ 8 - 0
src/client/js/services/AdminGeneralSecurityContainer.js

@@ -63,6 +63,14 @@ export default class AdminGeneralSecurityContainer extends Container {
     return 'AdminGeneralSecurityContainer';
   }
 
+  /**
+   * get isWikiModeForced
+   * @return {bool} isWikiModeForced
+   */
+  isWikiModeForced() {
+    return this.state.wikiMode === 'public';
+  }
+
   /**
    * Change restrictGuestMode
    */

+ 1 - 1
src/server/routes/apiv3/security-setting.js

@@ -319,7 +319,7 @@ module.exports = (crowi) => {
         pageCompleteDeletionAuthority: await crowi.configManager.getConfig('crowi', 'security:pageCompleteDeletionAuthority'),
         hideRestrictedByOwner: await crowi.configManager.getConfig('crowi', 'security:list-policy:hideRestrictedByOwner'),
         hideRestrictedByGroup: await crowi.configManager.getConfig('crowi', 'security:list-policy:hideRestrictedByGroup'),
-        wikiMode: await crowi.configManager.getConfigFromEnvVars('crowi', 'security:wikiMode'),
+        wikiMode: await crowi.configManager.getConfig('crowi', 'security:wikiMode'),
       },
       localSetting: {
         registrationMode: await crowi.configManager.getConfig('crowi', 'security:registrationMode'),