Shun Miyazawa 4 ani în urmă
părinte
comite
c3d6091758

+ 8 - 3
packages/app/src/components/Admin/Security/SecuritySetting.jsx

@@ -311,9 +311,14 @@ class SecuritySetting extends React.Component {
     const { t, adminGeneralSecurityContainer } = this.props;
     const { t, adminGeneralSecurityContainer } = this.props;
     const {
     const {
       currentRestrictGuestMode, currentPageDeletionAuthority, currentPageCompleteDeletionAuthority,
       currentRestrictGuestMode, currentPageDeletionAuthority, currentPageCompleteDeletionAuthority,
-      currentPageRecursiveDeletionAuthority, currentPageRecursiveCompleteDeletionAuthority,
+      currentPageRecursiveDeletionAuthority, currentPageRecursiveCompleteDeletionAuthority, wikiMode,
     } = adminGeneralSecurityContainer.state;
     } = adminGeneralSecurityContainer.state;
 
 
+
+    let guestModeValue = '';
+    const adminSecuritySettingElem = document.getElementById('admin-security-setting');
+    guestModeValue = adminSecuritySettingElem.getAttribute('guest-mode-value');
+
     const isButtonDisabledForDeletion = !validateDeleteConfigs(
     const isButtonDisabledForDeletion = !validateDeleteConfigs(
       adminGeneralSecurityContainer.state.currentPageDeletionAuthority, PageDeleteConfigValue.AdminAndAuthor,
       adminGeneralSecurityContainer.state.currentPageDeletionAuthority, PageDeleteConfigValue.AdminAndAuthor,
     );
     );
@@ -405,8 +410,8 @@ class SecuritySetting extends React.Component {
                 aria-expanded="true"
                 aria-expanded="true"
               >
               >
                 <span className="float-left">
                 <span className="float-left">
-                  {currentRestrictGuestMode === 'Deny' && t('security_setting.guest_mode.deny')}
-                  {currentRestrictGuestMode === 'Readonly' && t('security_setting.guest_mode.readonly')}
+                  {guestModeValue === 'Deny' && t('security_setting.guest_mode.deny')}
+                  {guestModeValue === 'Readonly' && t('security_setting.guest_mode.readonly')}
                 </span>
                 </span>
               </button>
               </button>
               <div className="dropdown-menu" aria-labelledby="dropdownMenuButton">
               <div className="dropdown-menu" aria-labelledby="dropdownMenuButton">

+ 0 - 2
packages/app/src/server/routes/admin.js

@@ -101,11 +101,9 @@ module.exports = function(crowi, app) {
   // app.get('/admin/security'                  , admin.security.index);
   // app.get('/admin/security'                  , admin.security.index);
   actions.security = {};
   actions.security = {};
   actions.security.index = function(req, res) {
   actions.security.index = function(req, res) {
-    const isWikiModeForced = aclService.isWikiModeForced();
     const guestModeValue = aclService.getGuestModeValue();
     const guestModeValue = aclService.getGuestModeValue();
 
 
     return res.render('admin/security', {
     return res.render('admin/security', {
-      isWikiModeForced,
       guestModeValue,
       guestModeValue,
     });
     });
   };
   };

+ 6 - 1
packages/app/src/server/views/admin/security.html

@@ -7,5 +7,10 @@
 {% endblock %}
 {% endblock %}
 
 
 {% block content_main %}
 {% block content_main %}
-<div id="admin-security-setting" class="admin-security"></div>
+<div
+  id="admin-security-setting"
+  class="admin-security"
+  guest-mode-value="{{guestModeValue}}"
+>
+</div>
 {% endblock content_main %}
 {% endblock content_main %}