Project

General

Profile

« Previous | Next » 

Revision e26886b3

Added by Ohad Levy over 12 years ago

  • ID e26886b35f63a5705159dc48ec9717a353f78c1f

fixes #1150 - When ticking On-the-fly user creation submit button and fields are hidden

View differences:

app/helpers/auth_source_ldaps_helper.rb
module AuthSourceLdapsHelper
def on_the_fly? authsource
return false if authsource.new_record?
authsource.onthefly_register?
end
end
app/models/auth_source_ldap.rb
require 'iconv'
class AuthSourceLdap < AuthSource
validates_presence_of :host, :port, :attr_login
validates_presence_of :host, :port
validates_presence_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :if => Proc.new {|auth| auth.onthefly_register? }
validates_length_of :name, :host, :account_password, :maximum => 60, :allow_nil => true
validates_length_of :account, :base_dn, :maximum => 255, :allow_nil => true
validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
app/views/auth_source_ldaps/_form.html.erb
<%= f.label :tls, "LDAPS", :class => "span-3" %>
</p>
<p class="span-24">
<%= f.label :account, nil, :class => "span-2" %>
<%= f.text_field :account, :class => "span-3" %>
<%= f.label :account, nil, :class => "span-2" %>
<%= f.text_field :account, :class => "span-3" %>
<small> Use this account to authenticate,<i>optional</i> </small>
</p>
<p class="span-24">
......
<small> Use this account to authenticate, <i>optional</i> </small>
</p>
<p class="span-24">
<%= f.label :base_dn ,nil, :class => "span-2" %>
<%= f.text_field :base_dn, :class => "span-10" %>
<%= f.check_box :onthefly_register, :class => "span-2", :onchange => "$('#on_the_fly_attrs').toggle()" %>
<%= f.label :onthefly_register, "On-the-fly user creation", :class => "span-5 last" %>
<%= f.label :base_dn ,nil, :class => "span-2" %>
<%= f.text_field :base_dn, :class => "span-10" %>
<%= f.check_box :onthefly_register, :class => "span-2", :onchange => "$('#on_the_fly_attrs').toggle()" %>
<%= f.label :onthefly_register, "On-the-fly user creation", :class => "span-5 last" %>
</p>
<div id="on_the_fly_attrs" class="span-24 last", <%= display(@auth_source_ldap.onthefly_register?) %>>
<div id="on_the_fly_attrs" class="span-24 last", <%= display?(!on_the_fly?(@auth_source_ldap)) %>>
<% field_set_tag("Attributes for on the fly user creation") do %>
<p class="span-24">
<%= f.label :attr_login, nil, :class => "span-3" %>
<%= f.text_field :attr_login, :class => "span-4" %>
<small class="last" >e.g. uid</small>
<%= f.label :attr_login, nil, :class => "span-3" %>
<%= f.text_field :attr_login, :class => "span-4" %>
<small class="last" >e.g. uid</small>
</p>
<p class="span-24">
<%= f.label :attr_firstname, nil, :class => "span-3" %>
<%= f.text_field :attr_firstname, :class => "span-4" %>
<small class="last">e.g. givenName</small>
<%= f.label :attr_firstname, nil, :class => "span-3" %>
<%= f.text_field :attr_firstname, :class => "span-4" %>
<small class="last">e.g. givenName</small>
</p>
<p class="span-24">
<%= f.label :attr_lastname, nil, :class => "span-3" %>
<%= f.text_field :attr_lastname, :class => "span-4" %>
<small class="last">e.g. sn</small>
<%= f.label :attr_lastname, nil, :class => "span-3" %>
<%= f.text_field :attr_lastname, :class => "span-4" %>
<small class="last">e.g. sn</small>
</p>
<p class="span-24">
<%= f.label :attr_mail, nil, :class => "span-3" %>
<%= f.text_field :attr_mail, :class => "span-4" %>
<small class="last">e.g. mail</small>
<p class="span-24 last">
<%= f.label :attr_mail, nil, :class => "span-3" %>
<%= f.text_field :attr_mail, :class => "span-4" %>
<small class="last">e.g. mail</small>
</p>
<% end -%>
<%= f.submit "Submit" %>
</div>
<br>
<%= f.submit "Submit" %>
<% end %>

Also available in: Unified diff