shinoka7 6 лет назад
Родитель
Сommit
3a11cc2cb9
2 измененных файлов с 6 добавлено и 2 удалено
  1. 5 1
      src/server/routes/admin.js
  2. 1 1
      src/server/views/admin/security.html

+ 5 - 1
src/server/routes/admin.js

@@ -105,7 +105,11 @@ 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) {
-    return res.render('admin/security');
+    const isAclEnabled = aclService.isAclEnabled();
+
+    return res.render('admin/security', {
+      isAclEnabled,
+    });
   };
   };
 
 
   // app.get('/admin/markdown'                  , admin.markdown.index);
   // app.get('/admin/markdown'                  , admin.markdown.index);

+ 1 - 1
src/server/views/admin/security.html

@@ -45,7 +45,7 @@
             <div class="col-xs-6">
             <div class="col-xs-6">
               <select class="form-control selectpicker" name="settingForm[security:restrictGuestMode]" value="{{ getConfig('crowi', 'security:restrictGuestMode') }}">
               <select class="form-control selectpicker" name="settingForm[security:restrictGuestMode]" value="{{ getConfig('crowi', 'security:restrictGuestMode') }}">
                 {% for modeValue, modeLabel in consts.restrictGuestMode %}
                 {% for modeValue, modeLabel in consts.restrictGuestMode %}
-                <option value="{{ t(modeValue) }}" {% if modeValue == getConfig('crowi', 'security:restrictGuestMode') %}selected{% endif %} {% if getConfig('crowi', 'security:wikiMode') == 'private' || getConfig('crowi', 'security:wikiMode') == 'public' %}disabled{% endif %}>{{ t(modeLabel) }}</option>
+                <option value="{{ t(modeValue) }}" {% if modeValue == getConfig('crowi', 'security:restrictGuestMode') %}selected{% endif %} {% if !isAclEnabled %}disabled{% endif %}>{{ t(modeLabel) }}</option>
                 {% endfor %}
                 {% endfor %}
               </select>
               </select>
             </div>
             </div>