Use custom LDAP label in LDAP signin form.
This commit is contained in:
parent
606d24ff2d
commit
09791774a5
|
@ -61,6 +61,7 @@ v 7.9.0 (unreleased)
|
|||
- Allow smb:// links in Markdown text.
|
||||
- Filter merge request by title or description at Merge Requests page
|
||||
- Block user if he/she was blocked in Active Directory
|
||||
- Use custom LDAP label in LDAP signin form.
|
||||
|
||||
v 7.8.4
|
||||
- Fix issue_tracker_id substitution in custom issue trackers
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
= form_tag(user_omniauth_callback_path(provider), id: 'new_ldap_user' ) do
|
||||
= text_field_tag :username, nil, {class: "form-control top", placeholder: "LDAP Login", autofocus: "autofocus"}
|
||||
= form_tag(user_omniauth_callback_path(server['provider_name']), id: 'new_ldap_user' ) do
|
||||
= text_field_tag :username, nil, {class: "form-control top", placeholder: "#{server['label']} Login", autofocus: "autofocus"}
|
||||
= password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"}
|
||||
= button_tag "LDAP Sign in", class: "btn-save btn"
|
||||
= button_tag "#{server['label']} Sign in", class: "btn-save btn"
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
.tab-content
|
||||
- @ldap_servers.each_with_index do |server, i|
|
||||
%div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero?)}
|
||||
= render 'devise/sessions/new_ldap', provider: server['provider_name']
|
||||
= render 'devise/sessions/new_ldap', server: server
|
||||
- if signin_enabled?
|
||||
%div#tab-signin.tab-pane
|
||||
= render 'devise/sessions/new_base'
|
||||
|
|
Loading…
Reference in New Issue