summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-01-29 15:59:27 +0100
committerGitHub2018-01-29 15:59:27 +0100
commitadc781f7e3bcc8611df8f661880258f136d15767 (patch)
treec22c7e2d048742cbe6cb3acd177ff07174e40677
parente18e05541c52908034b672a2abe79a1c51df5607 (diff)
parente44751b3f136e7a438b1379a8d865bdff6cf235e (diff)
Merge pull request #704 from SISheogorath/fix/ldapProviderName
Fix ldap provider name in template
-rw-r--r--lib/response.js2
-rw-r--r--public/views/shared/signin-modal.ejs2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/response.js b/lib/response.js
index 445aa0d7..c874ce9c 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -69,6 +69,7 @@ function showIndex (req, res, next) {
dropbox: config.isDropboxEnable,
google: config.isGoogleEnable,
ldap: config.isLDAPEnable,
+ ldapProviderName: config.ldap.providerName,
saml: config.isSAMLEnable,
email: config.isEmailEnable,
allowemailregister: config.allowemailregister,
@@ -103,6 +104,7 @@ function responseHackMD (res, note) {
dropbox: config.isDropboxEnable,
google: config.isGoogleEnable,
ldap: config.isLDAPEnable,
+ ldapProviderName: config.ldap.providerName,
saml: config.isSAMLEnable,
email: config.isEmailEnable,
allowemailregister: config.allowemailregister,
diff --git a/public/views/shared/signin-modal.ejs b/public/views/shared/signin-modal.ejs
index 7b44cfb0..ce01c739 100644
--- a/public/views/shared/signin-modal.ejs
+++ b/public/views/shared/signin-modal.ejs
@@ -52,7 +52,7 @@
<hr>
<% }%>
<% if(ldap) { %>
- <h4>Via <% if (ldap.providerName) { %> <%- ldap.providerName %> (LDAP) <% } else { %> LDAP <% } %></h4>
+ <h4>Via <% if (ldapProviderName) { %> <%= ldapProviderName %> (LDAP) <% } else { %> LDAP <% } %></h4>
<form data-toggle="validator" role="form" class="form-horizontal" method="post" enctype="application/x-www-form-urlencoded">
<div class="form-group">
<div class="col-sm-12">