status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #704 from SISheogorath/fix/ldapProviderName 

Fix ldap provider name in template
This commit is contained in:
Christoph (Sheogorath) Kern 2018-01-29 15:59:27 +01:00 committed by GitHub
parent e18e05541c e44751b3f1
commit adc781f7e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/response.js
View File

@ -69,6 +69,7 @@ function showIndex (req, res, next) {
dropbox: config.isDropboxEnable, dropbox: config.isDropboxEnable,
google: config.isGoogleEnable, google: config.isGoogleEnable,
ldap: config.isLDAPEnable, ldap: config.isLDAPEnable,
ldapProviderName: config.ldap.providerName,
saml: config.isSAMLEnable, saml: config.isSAMLEnable,
email: config.isEmailEnable, email: config.isEmailEnable,
allowemailregister: config.allowemailregister, allowemailregister: config.allowemailregister,
@ -103,6 +104,7 @@ function responseHackMD (res, note) {
dropbox: config.isDropboxEnable, dropbox: config.isDropboxEnable,
google: config.isGoogleEnable, google: config.isGoogleEnable,
ldap: config.isLDAPEnable, ldap: config.isLDAPEnable,
ldapProviderName: config.ldap.providerName,
saml: config.isSAMLEnable, saml: config.isSAMLEnable,
email: config.isEmailEnable, email: config.isEmailEnable,
allowemailregister: config.allowemailregister, allowemailregister: config.allowemailregister,

2
public/views/shared/signin-modal.ejs
View File

@ -52,7 +52,7 @@
<hr> <hr>
<% }%> <% }%>
<% if(ldap) { %> <% 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"> <form data-toggle="validator" role="form" class="form-horizontal" method="post" enctype="application/x-www-form-urlencoded">
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">