Преглед изворни кода

use getConfig to get security:passport-saml:isEnabled(SAML_ENABLED)

utsushiiro пре 7 година
родитељ
комит
c8f100cc75
2 измењених фајлова са 7 додато и 1 уклоњено
  1. 6 0
      src/server/service/config-loader.js
  2. 1 1
      src/server/views/admin/widget/passport/saml.html

+ 6 - 0
src/server/service/config-loader.js

@@ -114,6 +114,12 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     ns:      'crowi',
     ns:      'crowi',
     key:     'security:passport-saml:useOnlyEnvVars',
     key:     'security:passport-saml:useOnlyEnvVars',
     type:    TYPES.BOOLEAN,
     type:    TYPES.BOOLEAN,
+    default: false
+  },
+  SAML_ENABLED: {
+    ns:      'crowi',
+    key:     'security:passport-saml:isEnabled',
+    type:    TYPES.BOOLEAN,
     default: null
     default: null
   },
   },
   SAML_ENTRY_POINT: {
   SAML_ENTRY_POINT: {

+ 1 - 1
src/server/views/admin/widget/passport/saml.html

@@ -3,7 +3,7 @@
   <legend class="alert-anchor">{{ t("security_setting.SAML.name") }} {{ t("security_setting.configuration") }}</legend>
   <legend class="alert-anchor">{{ t("security_setting.SAML.name") }} {{ t("security_setting.configuration") }}</legend>
 
 
   {% set nameForIsSamlEnabled = "settingForm[security:passport-saml:isEnabled]" %}
   {% set nameForIsSamlEnabled = "settingForm[security:passport-saml:isEnabled]" %}
-  {% set isSamlEnabled = settingForm['security:passport-saml:isEnabled'] %}
+  {% set isSamlEnabled = getConfig('crowi', 'security:passport-saml:isEnabled') %}
 
 
   <div class="form-group">
   <div class="form-group">
     <label class="col-xs-3 control-label">{{ t("security_setting.SAML.name") }}</label>
     <label class="col-xs-3 control-label">{{ t("security_setting.SAML.name") }}</label>