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

Merge pull request #5643 from weseek/fix/91877-guest-user-access-dropdown

fix: Guest User Access Dropdown shows wrong value
Yuki Takei 4 лет назад
Родитель
Сommit
8f51274128

+ 1 - 6
packages/app/src/server/routes/admin.js

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

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

@@ -367,7 +367,7 @@ module.exports = (crowi) => {
 
     const securityParams = {
       generalSetting: {
-        restrictGuestMode: await crowi.configManager.getConfig('crowi', 'security:restrictGuestMode'),
+        restrictGuestMode: crowi.aclService.getGuestModeValue(),
         pageDeletionAuthority: await crowi.configManager.getConfig('crowi', 'security:pageDeletionAuthority'),
         pageCompleteDeletionAuthority: await crowi.configManager.getConfig('crowi', 'security:pageCompleteDeletionAuthority'),
         pageRecursiveDeletionAuthority: await crowi.configManager.getConfig('crowi', 'security:pageRecursiveDeletionAuthority'),